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

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

drm/amdgpu:Always save uvd vcpu_bo in VM Mode 

commit f8bee6135e167f5b35b7789c74c2956dad14d0d5 upstream.

When UVD is in VM mode, there is not uvd handle exchanged,
uvd.handles are always 0. So vcpu_bo always need save,
Otherwise amdgpu driver will fail during suspend/resume.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105021


Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Reviewed-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>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 957cfa6f

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

+8 −5
Original line number Original line Diff line number Diff line
@@ -273,12 +273,15 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev) 
	if (adev->uvd.vcpu_bo == NULL)

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

		return 0;

		return 0;





	/* only valid for physical mode */

	if (adev->asic_type < CHIP_POLARIS10) {

		for (i = 0; i < adev->uvd.max_handles; ++i)

		for (i = 0; i < adev->uvd.max_handles; ++i)

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

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

				break;

				break;





		if (i == adev->uvd.max_handles)

		if (i == adev->uvd.max_handles)

			return 0;

			return 0;

	}





	cancel_delayed_work_sync(&adev->uvd.idle_work);

	cancel_delayed_work_sync(&adev->uvd.idle_work);