|
@@ -4282,7 +4282,8 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,
|
|
|
|
|
|
lockdep_assert_held(&obj->base.dev->struct_mutex);
|
|
lockdep_assert_held(&obj->base.dev->struct_mutex);
|
|
|
|
|
|
- if (!view && flags & PIN_MAPPABLE) {
|
|
|
|
|
|
+ if (flags & PIN_MAPPABLE &&
|
|
|
|
+ (!view || view->type == I915_GGTT_VIEW_NORMAL)) {
|
|
/* If the required space is larger than the available
|
|
/* If the required space is larger than the available
|
|
* aperture, we will not able to find a slot for the
|
|
* aperture, we will not able to find a slot for the
|
|
* object and unbinding the object now will be in
|
|
* object and unbinding the object now will be in
|