drm/amdgpu: Fix use of interruptible waiting

AlexXAmd · alexdeucher · commit 12d39245f6be · 2017-04-28T17:33:10.000-04:00
There is no good mechanism to handle the corresponding error.
When signal interrupt happens, unpin is not called.
As a result, inside AMDGPU, the statistic of pin size will be wrong.

Signed-off-by: Alex Xie &lt;AlexBin.Xie@amd.com&gt;
Reviewed-by: Christian König &lt;christian.koenig@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -169,7 +169,7 @@ static void amdgpu_flip_cleanup_unpin(struct amdgpu_flip_work *work,
 void amdgpu_crtc_cleanup_flip_ctx(struct amdgpu_flip_work *work,
 				  struct amdgpu_bo *new_abo)
 {
-	if (unlikely(amdgpu_bo_reserve(new_abo, false) != 0)) {
+	if (unlikely(amdgpu_bo_reserve(new_abo, true) != 0)) {
 		DRM_ERROR("failed to reserve new abo in error path\n");
 		amdgpu_flip_work_cleanup(work);
 		return;

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ static void amdgpu_flip_cleanup_unpin(struct amdgpu_flip_work *work,`
`169`	`169`	`void amdgpu_crtc_cleanup_flip_ctx(struct amdgpu_flip_work *work,`
`170`	`170`	`struct amdgpu_bo *new_abo)`
`171`	`171`	`{`
`172`		`- if (unlikely(amdgpu_bo_reserve(new_abo, false) != 0)) {`
	`172`	`+ if (unlikely(amdgpu_bo_reserve(new_abo, true) != 0)) {`
`173`	`173`	`DRM_ERROR("failed to reserve new abo in error path\n");`
`174`	`174`	`amdgpu_flip_work_cleanup(work);`
`175`	`175`	`return;`