Commit 91544c45 authored by Jesse.Zhang's avatar Jesse.Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: Fix jpeg ring test order in vcn_v4_0_3 



Fix the vcn reset sequence in vcn_v4_0_3_ring_reset() to restore
JPEG power state and unlock the JPEG powergating mutex before
running the JPEG ring post-reset helper.

Fixes: d25c67fd ("drm/amdgpu/vcn4.0.3: rework reset handling")
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarJesse Zhang <jesse.zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7a3fbdfd

drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c

+1 −1
Original line number Diff line number Diff line
@@ -1742,11 +1742,11 @@ static int vcn_v4_0_3_ring_reset(struct amdgpu_ring *ring, 
		goto unlock;

	}



	r = vcn_v4_0_3_reset_jpeg_post_helper(adev, ring->me);

	if (pg_state)

		amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_JPEG,

						       AMD_PG_STATE_GATE);

	mutex_unlock(&adev->jpeg.jpeg_pg_lock);

	r = vcn_v4_0_3_reset_jpeg_post_helper(adev, ring->me);



unlock:

	mutex_unlock(&vinst->engine_reset_mutex);