diff options
| author | Simona Vetter <[email protected]> | 2025-07-11 21:55:40 +0000 |
|---|---|---|
| committer | Simona Vetter <[email protected]> | 2025-07-11 21:55:40 +0000 |
| commit | 7e11e01d1f1d00cb308f9351511e9597a4f70678 (patch) | |
| tree | c8c486296ada4fabcdf6908240f4bc38d80748af /drivers/gpu/drm/amd/pm/amdgpu_pm.c | |
| parent | Merge tag 'drm-intel-next-2025-07-10' of https://gitlab.freedesktop.org/drm/i... (diff) | |
| parent | drm/amdgpu: fix use-after-free in amdgpu_userq_suspend+0x51a/0x5a0 (diff) | |
| download | kernel-7e11e01d1f1d00cb308f9351511e9597a4f70678.tar.gz kernel-7e11e01d1f1d00cb308f9351511e9597a4f70678.zip | |
Merge tag 'amd-drm-next-6.17-2025-07-11' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-6.17-2025-07-11:
amdgpu:
- Clean up function signatures
- GC 10 KGQ reset fix
- SDMA reset cleanups
- Misc fixes
- LVDS fixes
- UserQ fix
amdkfd:
- Reset fix
Signed-off-by: Simona Vetter <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/pm/amdgpu_pm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c index edd9895b46c0..4b151bbaffaa 100644 --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c @@ -1890,7 +1890,7 @@ out: static int ss_power_attr_update(struct amdgpu_device *adev, struct amdgpu_device_attr *attr, uint32_t mask, enum amdgpu_device_attr_states *states) { - if (!amdgpu_device_supports_smart_shift(adev_to_drm(adev))) + if (!amdgpu_device_supports_smart_shift(adev)) *states = ATTR_STATE_UNSUPPORTED; return 0; @@ -1901,7 +1901,7 @@ static int ss_bias_attr_update(struct amdgpu_device *adev, struct amdgpu_device_ { uint32_t ss_power; - if (!amdgpu_device_supports_smart_shift(adev_to_drm(adev))) + if (!amdgpu_device_supports_smart_shift(adev)) *states = ATTR_STATE_UNSUPPORTED; else if (amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_SS_APU_SHARE, (void *)&ss_power)) |