[PATCH] warn-on-ebusy

Chris Wilson chris at chris-wilson.co.uk
Wed Jun 20 08:14:02 UTC 2018


---
 drivers/gpu/drm/i915/i915_gem_fence_reg.c | 2 +-
 drivers/gpu/drm/i915/i915_vma.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.c b/drivers/gpu/drm/i915/i915_gem_fence_reg.c
index d548ac05ccd7..1af4e5288112 100644
--- a/drivers/gpu/drm/i915/i915_gem_fence_reg.c
+++ b/drivers/gpu/drm/i915/i915_gem_fence_reg.c
@@ -292,7 +292,7 @@ int i915_vma_put_fence(struct i915_vma *vma)
 	if (!fence)
 		return 0;
 
-	if (fence->pin_count)
+	if (WARN_ON(fence->pin_count))
 		return -EBUSY;
 
 	return fence_update(fence, NULL);
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index e82aa804cdba..ec099657aab5 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -875,7 +875,7 @@ int i915_vma_unbind(struct i915_vma *vma)
 	}
 	GEM_BUG_ON(i915_vma_is_active(vma));
 
-	if (i915_vma_is_pinned(vma))
+	if (WARN_ON(i915_vma_is_pinned(vma)))
 		return -EBUSY;
 
 	if (!drm_mm_node_allocated(&vma->node))
-- 
2.18.0.rc2



More information about the Intel-gfx-trybot mailing list