From: Alex Deucher <alexander.deucher@xxxxxxx>
commit ded6ad4c6e2005e959ea09abba16c451433dd34b upstream.
Need to use the correct IP block type. VCE vs VCN.
Fixes mclk issues on Hawaii.
Suggested by selendym.
Fixes: 82ae6619a450 ("drm/amdgpu: update the handle ptr in wait_for_idle")
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3997
Reviewed-by: Boyuan Zhang <Boyuan.Zhang@xxxxxxx>
Cc: Sunil Khatri <sunil.khatri@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
(cherry picked from commit 02438acd252395628d74cfac692efbb676d21521)
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
index c633b7ff2943..09fd6ef99b3d 100644
--- a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
@@ -284,7 +284,7 @@ static int vce_v2_0_stop(struct amdgpu_device *adev)
return 0;
}
- ip_block = amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_VCN);
+ ip_block = amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_VCE);
if (!ip_block)
return -EINVAL;
--
2.48.1
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-6.13/drm-amd-display-restore-correct-backlight-brightness-after-a-gpu-reset.patch
queue-6.13/drm-amdgpu-vce2-fix-ip-block-reference.patch
queue-6.13/drm-amdgpu-display-allow-dcc-for-video-formats-on-gfx12.patch
queue-6.13/drm-amd-display-fix-slab-use-after-free-on-hdcp_work.patch
queue-6.13/drm-amd-display-fix-missing-.is_two_pixels_per_container.patch
queue-6.13/drm-amd-display-fix-default-brightness.patch
queue-6.13/drm-amd-display-disable-unneeded-hpd-interrupts-during-dm_init.patch
queue-6.13/drm-amdgpu-null-check-bo-s-backing-store-when-determining-gfx12-pte-flags.patch
queue-6.13/drm-amd-amdkfd-evict-all-queues-even-hws-remove-queue-failed.patch
queue-6.13/drm-amd-display-fix-out-of-bound-accesses.patch
queue-6.13/drm-amd-display-assign-normalized_pix_clk-when-color-depth-14.patch
