diff options
| author | Dmitry Torokhov <[email protected]> | 2025-02-26 00:03:25 +0000 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2025-02-26 00:03:25 +0000 |
| commit | 0b119045b79a672bc6d8f18641c60fc8ce1b4585 (patch) | |
| tree | 69c63ecfec55b9576c34dc742e0c38f46f8a317a /drivers/gpu/drm/amd/amdgpu/si.c | |
| parent | Input: pm8941-pwrkey - fix dev_dbg() output in pm8941_pwrkey_irq() (diff) | |
| parent | Linux 6.14-rc4 (diff) | |
| download | kernel-0b119045b79a672bc6d8f18641c60fc8ce1b4585.tar.gz kernel-0b119045b79a672bc6d8f18641c60fc8ce1b4585.zip | |
Merge tag 'v6.14-rc4' into next
Sync up with the mainline.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/si.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/si.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c index 00f63d3fbea7..77ef7da2e4fe 100644 --- a/drivers/gpu/drm/amd/amdgpu/si.c +++ b/drivers/gpu/drm/amd/amdgpu/si.c @@ -2649,13 +2649,13 @@ static bool si_common_is_idle(void *handle) return true; } -static int si_common_set_clockgating_state(void *handle, +static int si_common_set_clockgating_state(struct amdgpu_ip_block *ip_block, enum amd_clockgating_state state) { return 0; } -static int si_common_set_powergating_state(void *handle, +static int si_common_set_powergating_state(struct amdgpu_ip_block *ip_block, enum amd_powergating_state state) { return 0; |