aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 462a8f2ad3a2..a549be5f535b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1378,6 +1378,8 @@ i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj)
1378 int page_count = obj->base.size / PAGE_SIZE; 1378 int page_count = obj->base.size / PAGE_SIZE;
1379 int ret, i; 1379 int ret, i;
1380 1380
1381 BUG_ON(obj->gtt_space);
1382
1381 if (obj->pages == NULL) 1383 if (obj->pages == NULL)
1382 return 0; 1384 return 0;
1383 1385
@@ -2293,6 +2295,8 @@ i915_gem_object_unbind(struct drm_i915_gem_object *obj)
2293 if (obj->pin_count) 2295 if (obj->pin_count)
2294 return -EBUSY; 2296 return -EBUSY;
2295 2297
2298 BUG_ON(obj->pages == NULL);
2299
2296 ret = i915_gem_object_finish_gpu(obj); 2300 ret = i915_gem_object_finish_gpu(obj);
2297 if (ret) 2301 if (ret)
2298 return ret; 2302 return ret;