Commit 4fc30ea7 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amdgpu: fix uvd crash on Polaris12 during driver unloading 



There was a change(below) target for such issue:
d82e2c24 ("drm/amdgpu: Fix crash on device remove/driver unload")
But the fix for VI ASICs was missing there. This is a supplement for
that.

Fixes: d82e2c24 ("drm/amdgpu: Fix crash on device remove/driver unload")

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2d32ffd6

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

+13 −11
Original line number Diff line number Diff line
@@ -534,6 +534,19 @@ static int uvd_v6_0_hw_fini(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	cancel_delayed_work_sync(&adev->uvd.idle_work);



	if (RREG32(mmUVD_STATUS) != 0)

		uvd_v6_0_stop(adev);



	return 0;

}



static int uvd_v6_0_suspend(void *handle)

{

	int r;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	/*

	 * Proper cleanups before halting the HW engine:

	 *   - cancel the delayed idle work
@@ -558,17 +571,6 @@ static int uvd_v6_0_hw_fini(void *handle) 
						       AMD_CG_STATE_GATE);

	}



	if (RREG32(mmUVD_STATUS) != 0)

		uvd_v6_0_stop(adev);



	return 0;

}



static int uvd_v6_0_suspend(void *handle)

{

	int r;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	r = uvd_v6_0_hw_fini(adev);

	if (r)

		return r;