diff options
| author |   Petr Mladek <pmladek@suse.com> | 2025-03-27 11:09:34 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2025-03-27 11:09:34 +0100 |
| commit | f49040c7aaa5532a1f94355ef5073c49e6b32349 (patch) | |
| tree | ee9513bba2c685226ab4addf98152afd262c50c3 /drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c | |
| parent | printk/panic: Add option to allow non-panic CPUs to write to the ring buffer. (diff) | |
| parent | printk: Check CON_SUSPEND when unblanking a console (diff) | |
| download | wireguard-linux-f49040c7aaa5532a1f94355ef5073c49e6b32349.tar.xz wireguard-linux-f49040c7aaa5532a1f94355ef5073c49e6b32349.zip | |
Merge branch 'for-6.15-console-suspend-api-cleanup' into for-linus
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c index 263ce1811cc8..732744488b03 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c @@ -77,7 +77,8 @@ static int isp_load_fw_by_psp(struct amdgpu_device *adev) sizeof(ucode_prefix)); /* read isp fw */ - r = amdgpu_ucode_request(adev, &adev->isp.fw, "amdgpu/%s.bin", ucode_prefix); + r = amdgpu_ucode_request(adev, &adev->isp.fw, AMDGPU_UCODE_OPTIONAL, + "amdgpu/%s.bin", ucode_prefix); if (r) { amdgpu_ucode_release(&adev->isp.fw); return r; @@ -128,13 +129,13 @@ static bool isp_is_idle(void *handle) return true; } -static int isp_set_clockgating_state(void *handle, +static int isp_set_clockgating_state(struct amdgpu_ip_block *ip_block, enum amd_clockgating_state state) { return 0; } -static int isp_set_powergating_state(void *handle, +static int isp_set_powergating_state(struct amdgpu_ip_block *ip_block, enum amd_powergating_state state) { return 0; |