|
@@ -1668,11 +1668,11 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj)
|
|
if (obj->pages == NULL)
|
|
if (obj->pages == NULL)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- BUG_ON(i915_gem_obj_ggtt_bound(obj));
|
|
|
|
-
|
|
|
|
if (obj->pages_pin_count)
|
|
if (obj->pages_pin_count)
|
|
return -EBUSY;
|
|
return -EBUSY;
|
|
|
|
|
|
|
|
+ BUG_ON(i915_gem_obj_ggtt_bound(obj));
|
|
|
|
+
|
|
/* ->put_pages might need to allocate memory for the bit17 swizzle
|
|
/* ->put_pages might need to allocate memory for the bit17 swizzle
|
|
* array, hence protect them from being reaped by removing them from gtt
|
|
* array, hence protect them from being reaped by removing them from gtt
|
|
* lists early. */
|
|
* lists early. */
|