Commit 7a6901d7 authored by Alex Xie's avatar Alex Xie Committed by Alex Deucher
Browse files

drm/amdgpu: Fix use of interruptible waiting 



1. The signal interrupt can affect the expected behaviour.
2. There is no mechanism to handle the corresponding error.

Signed-off-by: default avatarAlex Xie <AlexBin.Xie@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8ab25b4f

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

+3 −3
Original line number Diff line number Diff line
@@ -2140,7 +2140,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon) 


		if (amdgpu_crtc->cursor_bo) {

			struct amdgpu_bo *aobj = gem_to_amdgpu_bo(amdgpu_crtc->cursor_bo);

			r = amdgpu_bo_reserve(aobj, false);

			r = amdgpu_bo_reserve(aobj, true);

			if (r == 0) {

				amdgpu_bo_unpin(aobj);

				amdgpu_bo_unreserve(aobj);
@@ -2153,7 +2153,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon) 
		robj = gem_to_amdgpu_bo(rfb->obj);

		/* don't unpin kernel fb objects */

		if (!amdgpu_fbdev_robj_is_fb(adev, robj)) {

			r = amdgpu_bo_reserve(robj, false);

			r = amdgpu_bo_reserve(robj, true);

			if (r == 0) {

				amdgpu_bo_unpin(robj);

				amdgpu_bo_unreserve(robj);
@@ -2260,7 +2260,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) 


		if (amdgpu_crtc->cursor_bo) {

			struct amdgpu_bo *aobj = gem_to_amdgpu_bo(amdgpu_crtc->cursor_bo);

			r = amdgpu_bo_reserve(aobj, false);

			r = amdgpu_bo_reserve(aobj, true);

			if (r == 0) {

				r = amdgpu_bo_pin(aobj,

						  AMDGPU_GEM_DOMAIN_VRAM,

CRA Git | Maintained and supported by SUSTech CRA and CCSE