Commit db998890 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Split up UVD suspend into prepare and suspend steps 



amdgpu_uvd_suspend() allocates memory and copies objects into that
allocated memory.  This fails under memory pressure.  Instead move
majority of this code into a prepare step when swap can still be
allocated.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cb11ca32

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

+8 −4
Original line number Diff line number Diff line
@@ -418,12 +418,11 @@ int amdgpu_uvd_entity_init(struct amdgpu_device *adev) 
	return 0;

}



int amdgpu_uvd_suspend(struct amdgpu_device *adev)

int amdgpu_uvd_prepare_suspend(struct amdgpu_device *adev)

{

	unsigned int size;

	void *ptr;

	int i, j, idx;

	bool in_ras_intr = amdgpu_ras_intr_triggered();



	cancel_delayed_work_sync(&adev->uvd.idle_work);
@@ -452,7 +451,7 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev) 


		if (drm_dev_enter(adev_to_drm(adev), &idx)) {

			/* re-write 0 since err_event_athub will corrupt VCPU buffer */

			if (in_ras_intr)

			if (amdgpu_ras_intr_triggered())

				memset(adev->uvd.inst[j].saved_bo, 0, size);

			else

				memcpy_fromio(adev->uvd.inst[j].saved_bo, ptr, size);
@@ -461,7 +460,12 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev) 
		}

	}



	if (in_ras_intr)

	return 0;

}



int amdgpu_uvd_suspend(struct amdgpu_device *adev)

{

	if (amdgpu_ras_intr_triggered())

		DRM_WARN("UVD VCPU state may lost due to RAS ERREVENT_ATHUB_INTERRUPT\n");



	return 0;

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ struct amdgpu_uvd { 
int amdgpu_uvd_sw_init(struct amdgpu_device *adev);

int amdgpu_uvd_sw_fini(struct amdgpu_device *adev);

int amdgpu_uvd_entity_init(struct amdgpu_device *adev);

int amdgpu_uvd_prepare_suspend(struct amdgpu_device *adev);

int amdgpu_uvd_suspend(struct amdgpu_device *adev);

int amdgpu_uvd_resume(struct amdgpu_device *adev);

int amdgpu_uvd_get_create_msg(struct amdgpu_ring *ring, uint32_t handle,

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

+8 −0
Original line number Diff line number Diff line
@@ -706,6 +706,13 @@ static int uvd_v3_1_hw_fini(void *handle) 
	return 0;

}



static int uvd_v3_1_prepare_suspend(void *handle)

{

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



	return amdgpu_uvd_prepare_suspend(adev);

}



static int uvd_v3_1_suspend(void *handle)

{

	int r;
@@ -806,6 +813,7 @@ static const struct amd_ip_funcs uvd_v3_1_ip_funcs = { 
	.sw_fini = uvd_v3_1_sw_fini,

	.hw_init = uvd_v3_1_hw_init,

	.hw_fini = uvd_v3_1_hw_fini,

	.prepare_suspend = uvd_v3_1_prepare_suspend,

	.suspend = uvd_v3_1_suspend,

	.resume = uvd_v3_1_resume,

	.is_idle = uvd_v3_1_is_idle,

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

+8 −0
Original line number Diff line number Diff line
@@ -220,6 +220,13 @@ static int uvd_v4_2_hw_fini(void *handle) 
	return 0;

}



static int uvd_v4_2_prepare_suspend(void *handle)

{

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



	return amdgpu_uvd_prepare_suspend(adev);

}



static int uvd_v4_2_suspend(void *handle)

{

	int r;
@@ -756,6 +763,7 @@ static const struct amd_ip_funcs uvd_v4_2_ip_funcs = { 
	.sw_fini = uvd_v4_2_sw_fini,

	.hw_init = uvd_v4_2_hw_init,

	.hw_fini = uvd_v4_2_hw_fini,

	.prepare_suspend = uvd_v4_2_prepare_suspend,

	.suspend = uvd_v4_2_suspend,

	.resume = uvd_v4_2_resume,

	.is_idle = uvd_v4_2_is_idle,

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

+8 −0
Original line number Diff line number Diff line
@@ -218,6 +218,13 @@ static int uvd_v5_0_hw_fini(void *handle) 
	return 0;

}



static int uvd_v5_0_prepare_suspend(void *handle)

{

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



	return amdgpu_uvd_prepare_suspend(adev);

}



static int uvd_v5_0_suspend(void *handle)

{

	int r;
@@ -863,6 +870,7 @@ static const struct amd_ip_funcs uvd_v5_0_ip_funcs = { 
	.sw_fini = uvd_v5_0_sw_fini,

	.hw_init = uvd_v5_0_hw_init,

	.hw_fini = uvd_v5_0_hw_fini,

	.prepare_suspend = uvd_v5_0_prepare_suspend,

	.suspend = uvd_v5_0_suspend,

	.resume = uvd_v5_0_resume,

	.is_idle = uvd_v5_0_is_idle,