Commit 51dc0e1a authored by CQ Tang's avatar CQ Tang Committed by Matthew Auld

drm/i915/display: Check mappable aperture when pinning preallocated vma

When system does not have mappable aperture, ggtt->mappable_end=0. In
this case if we pass PIN_MAPPABLE when pinning vma, the pinning code
will return -ENOSPC. So conditionally set PIN_MAPPABLE if HAS_GMCH().
Suggested-by: default avatarChris P Wilson <chris.p.wilson@intel.com>
Signed-off-by: default avatarCQ Tang <cq.tang@intel.com>
Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Cc: Ap Kamal <kamal.ap@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarNirmoy Das <nirmoy.das@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220315181425.576828-6-matthew.auld@intel.com
parent ecbf2060
...@@ -51,6 +51,7 @@ initial_plane_vma(struct drm_i915_private *i915, ...@@ -51,6 +51,7 @@ initial_plane_vma(struct drm_i915_private *i915,
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
struct i915_vma *vma; struct i915_vma *vma;
u32 base, size; u32 base, size;
u64 pinctl;
if (!mem || plane_config->size == 0) if (!mem || plane_config->size == 0)
return NULL; return NULL;
...@@ -101,7 +102,10 @@ initial_plane_vma(struct drm_i915_private *i915, ...@@ -101,7 +102,10 @@ initial_plane_vma(struct drm_i915_private *i915,
if (IS_ERR(vma)) if (IS_ERR(vma))
goto err_obj; goto err_obj;
if (i915_ggtt_pin(vma, NULL, 0, PIN_MAPPABLE | PIN_OFFSET_FIXED | base)) pinctl = PIN_GLOBAL | PIN_OFFSET_FIXED | base;
if (HAS_GMCH(i915))
pinctl |= PIN_MAPPABLE;
if (i915_vma_pin(vma, 0, 0, pinctl))
goto err_obj; goto err_obj;
if (i915_gem_object_is_tiled(obj) && if (i915_gem_object_is_tiled(obj) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment