[AMD Official Use Only - AMD Internal Distribution Only]
> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Alex
> Deucher
> Sent: Friday, November 22, 2024 2:04 PM
> To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx>
> Subject: [PATCH] drm/amdgpu/jpeg1.0: fix idle work handler
>
> On VCN 1.0, VCN and JPEG use the same worker thread so cancel the vcn worker
> rather than jpeg. On VCN 2.0 and newer there are separate workers for each.
>
> Fixes: 93df74873703 ("drm/amdgpu/jpeg: cancel the jpeg worker")
> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Tested-by: George Zhang <george.zhang@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
> index 7319299f25ae..03b8b7cd5229 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
> @@ -604,7 +604,7 @@ static void jpeg_v1_0_set_irq_funcs(struct amdgpu_device
> *adev) static void jpeg_v1_0_ring_begin_use(struct amdgpu_ring *ring) {
> struct amdgpu_device *adev = ring->adev;
> - bool set_clocks = !cancel_delayed_work_sync(&adev->jpeg.idle_work);
> + bool set_clocks = !cancel_delayed_work_sync(&adev->vcn.idle_work);
> int cnt = 0;
>
> mutex_lock(&adev->vcn.vcn1_jpeg1_workaround);
> --
> 2.47.0
