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/amdgpu/amdgpu_acpi.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/amdgpu/amdgpu_acpi.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c index f5466c592d94..b047fdf81543 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c @@ -811,18 +811,18 @@ int amdgpu_acpi_power_shift_control(struct amdgpu_device *adev, /** * amdgpu_acpi_smart_shift_update - update dGPU device state to SBIOS * - * @dev: drm_device pointer + * @adev: amdgpu device pointer * @ss_state: current smart shift event * * returns 0 on success, * otherwise return error number. */ -int amdgpu_acpi_smart_shift_update(struct drm_device *dev, enum amdgpu_ss ss_state) +int amdgpu_acpi_smart_shift_update(struct amdgpu_device *adev, + enum amdgpu_ss ss_state) { - struct amdgpu_device *adev = drm_to_adev(dev); int r; - if (!amdgpu_device_supports_smart_shift(dev)) + if (!amdgpu_device_supports_smart_shift(adev)) return 0; switch (ss_state) { |