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

Commit 3f99dd81 authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher
Browse files

drm/amdgpu: save and restore UVD context with suspend and resume 



and revert fix following it accordingly

Revert "drm/amdgpu: stop trying to suspend UVD sessions v2"
Revert "drm/amdgpu: fix the UVD suspend sequence order"

Signed-off-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 749b48fa

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

+1 −0
Original line number Diff line number Diff line
@@ -1591,6 +1591,7 @@ struct amdgpu_uvd { 
	struct amdgpu_bo	*vcpu_bo;

	void			*cpu_addr;

	uint64_t		gpu_addr;

	void			*saved_bo;

	atomic_t		handles[AMDGPU_MAX_UVD_HANDLES];

	struct drm_file		*filp[AMDGPU_MAX_UVD_HANDLES];

	struct delayed_work	idle_work;

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

+26 −19
Original line number Diff line number Diff line
@@ -241,32 +241,34 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev) 


int amdgpu_uvd_suspend(struct amdgpu_device *adev)

{

	struct amdgpu_ring *ring = &adev->uvd.ring;

	int i, r;

	unsigned size;

	void *ptr;

	const struct common_firmware_header *hdr;

	int i;



	if (adev->uvd.vcpu_bo == NULL)

		return 0;



	for (i = 0; i < AMDGPU_MAX_UVD_HANDLES; ++i) {

		uint32_t handle = atomic_read(&adev->uvd.handles[i]);

		if (handle != 0) {

			struct fence *fence;

	for (i = 0; i < AMDGPU_MAX_UVD_HANDLES; ++i)

		if (atomic_read(&adev->uvd.handles[i]))

			break;



			amdgpu_uvd_note_usage(adev);

	if (i == AMDGPU_MAX_UVD_HANDLES)

		return 0;



			r = amdgpu_uvd_get_destroy_msg(ring, handle, false, &fence);

			if (r) {

				DRM_ERROR("Error destroying UVD (%d)!\n", r);

				continue;

			}

	hdr = (const struct common_firmware_header *)adev->uvd.fw->data;



			fence_wait(fence, false);

			fence_put(fence);

	size = amdgpu_bo_size(adev->uvd.vcpu_bo);

	size -= le32_to_cpu(hdr->ucode_size_bytes);



			adev->uvd.filp[i] = NULL;

			atomic_set(&adev->uvd.handles[i], 0);

		}

	}

	ptr = adev->uvd.cpu_addr;

	ptr += le32_to_cpu(hdr->ucode_size_bytes);



	adev->uvd.saved_bo = kmalloc(size, GFP_KERNEL);

	if (!adev->uvd.saved_bo)

		return -ENOMEM;



	memcpy(adev->uvd.saved_bo, ptr, size);



	return 0;

}
@@ -291,6 +293,11 @@ int amdgpu_uvd_resume(struct amdgpu_device *adev) 
	ptr = adev->uvd.cpu_addr;

	ptr += le32_to_cpu(hdr->ucode_size_bytes);



	if (adev->uvd.saved_bo != NULL) {

		memcpy(ptr, adev->uvd.saved_bo, size);

		kfree(adev->uvd.saved_bo);

		adev->uvd.saved_bo = NULL;

	} else

		memset(ptr, 0, size);



	return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -224,11 +224,11 @@ static int uvd_v4_2_suspend(void *handle) 
	int r;

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



	r = amdgpu_uvd_suspend(adev);

	r = uvd_v4_2_hw_fini(adev);

	if (r)

		return r;



	r = uvd_v4_2_hw_fini(adev);

	r = amdgpu_uvd_suspend(adev);

	if (r)

		return r;

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

+2 −2
Original line number Diff line number Diff line
@@ -220,11 +220,11 @@ static int uvd_v5_0_suspend(void *handle) 
	int r;

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



	r = amdgpu_uvd_suspend(adev);

	r = uvd_v5_0_hw_fini(adev);

	if (r)

		return r;



	r = uvd_v5_0_hw_fini(adev);

	r = amdgpu_uvd_suspend(adev);

	if (r)

		return r;

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

+4 −3
Original line number Diff line number Diff line
@@ -214,15 +214,16 @@ 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;



	/* Skip this for APU for now */

	if (!(adev->flags & AMD_IS_APU)) {

		r = amdgpu_uvd_suspend(adev);

		if (r)

			return r;

	}

	r = uvd_v6_0_hw_fini(adev);

	if (r)

		return r;



	return r;

}