Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 878275fa authored by James Zhu's avatar James Zhu Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu/vcn: Update vcn.cur_state during suspend 



[ Upstream commit 0a9b89b2e2e7b6d90f81ddc47e489be1043e01b1 ]

Replace vcn_v1_0_stop with vcn_v1_0_set_powergating_state during suspend,
to keep adev->vcn.cur_state update. It will fix VCN S3 hung issue.

Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e6a57a90

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

+2 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ static void vcn_v1_0_set_enc_ring_funcs(struct amdgpu_device *adev); 
static void vcn_v1_0_set_jpeg_ring_funcs(struct amdgpu_device *adev);

static void vcn_v1_0_set_irq_funcs(struct amdgpu_device *adev);

static void vcn_v1_0_jpeg_ring_set_patch_ring(struct amdgpu_ring *ring, uint32_t ptr);

static int vcn_v1_0_set_powergating_state(void *handle, enum amd_powergating_state state);



/**

 * vcn_v1_0_early_init - set function pointers
@@ -216,7 +217,7 @@ static int vcn_v1_0_hw_fini(void *handle) 
	struct amdgpu_ring *ring = &adev->vcn.ring_dec;



	if (RREG32_SOC15(VCN, 0, mmUVD_STATUS))

		vcn_v1_0_stop(adev);

		vcn_v1_0_set_powergating_state(adev, AMD_PG_STATE_GATE);



	ring->ready = false;