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

Commit 6800e2ea authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: stop calling amdgpu_gpu_reset from the flip code 



We don't return -EDEADLK any more.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9b389668

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

+1 −9
Original line number Original line Diff line number Diff line
@@ -38,20 +38,12 @@ 
static void amdgpu_flip_wait_fence(struct amdgpu_device *adev,

static void amdgpu_flip_wait_fence(struct amdgpu_device *adev,

				   struct fence **f)

				   struct fence **f)

{

{

	struct amdgpu_fence *fence;

	long r;

	long r;





	if (*f == NULL)

	if (*f == NULL)

		return;

		return;





	fence = to_amdgpu_fence(*f);

	if (fence) {

		r = fence_wait(&fence->base, false);

		if (r == -EDEADLK)

			r = amdgpu_gpu_reset(adev);

	} else

	r = fence_wait(*f, false);

	r = fence_wait(*f, false);



	if (r)

	if (r)

		DRM_ERROR("failed to wait on page flip fence (%ld)!\n", r);

		DRM_ERROR("failed to wait on page flip fence (%ld)!\n", r);