diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2023-10-02 14:43:06 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-25 15:45:28 -0800 |
| commit | 1db180f547056f90d2bd43bab2674e0c6d413f7c (patch) | |
| tree | 2a2d5d8aaa3c61c883cc70743ef2aa2ebb5fd456 | |
| parent | 1b37284a3c5dbdbf88f3c95a39a2be3cb6c71250 (diff) | |
| download | linux-stable-1db180f547056f90d2bd43bab2674e0c6d413f7c.tar.gz linux-stable-1db180f547056f90d2bd43bab2674e0c6d413f7c.tar.bz2 linux-stable-1db180f547056f90d2bd43bab2674e0c6d413f7c.zip | |
drm/amdgpu: fall back to INPUT power for AVG power via INFO IOCTL
[ Upstream commit d02069850fc102b07ae923535d5e212f2c8a34e9 ]
For backwards compatibility with userspace.
Fixes: 47f1724db4fe ("drm/amd: Introduce `AMDGPU_PP_SENSOR_GPU_INPUT_POWER`")
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2897
Reviewed-by: Yang Wang <kevinyang.wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index 583cf03950cd..598867919c4f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -1105,7 +1105,12 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) if (amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_GPU_AVG_POWER, (void *)&ui32, &ui32_size)) { - return -EINVAL; + /* fall back to input power for backwards compat */ + if (amdgpu_dpm_read_sensor(adev, + AMDGPU_PP_SENSOR_GPU_INPUT_POWER, + (void *)&ui32, &ui32_size)) { + return -EINVAL; + } } ui32 >>= 8; break; |