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: Chris P Wilson <chris.p.wilson@intel.com>
Signed-off-by: CQ Tang <cq.tang@intel.com>
Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Cc: Ap Kamal <kamal.ap@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Matthew 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: Nirmoy Das <nirmoy.das@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220315181425.576828-6-matthew.auld@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index 17373fd5536d708c41baa2f6b0324ac5f27fdd92..a934fcca59d20ba5d4c63a0ab01074ad05af96d0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -51,6 +51,7 @@ initial_plane_vma(struct drm_i915_private *i915,
        struct drm_i915_gem_object *obj;
        struct i915_vma *vma;
        u32 base, size;
+       u64 pinctl;
 
        if (!mem || plane_config->size == 0)
                return NULL;
@@ -101,7 +102,10 @@ initial_plane_vma(struct drm_i915_private *i915,
        if (IS_ERR(vma))
                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;
 
        if (i915_gem_object_is_tiled(obj) &&