On Thu, 10 Mar 2022 at 12:28, Matthew Auld <matthew.auld@xxxxxxxxx> wrote: > > From: CQ Tang <cq.tang@xxxxxxxxx> > > 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@xxxxxxxxx> > Signed-off-by: CQ Tang <cq.tang@xxxxxxxxx> > Cc: Radhakrishna Sripada <radhakrishna.sripada@xxxxxxxxx> > Cc: Ap Kamal <kamal.ap@xxxxxxxxx> > Signed-off-by: Matthew Auld <matthew.auld@xxxxxxxxx> > Cc: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx> > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> This at least prevents incorrectly using PIN_MAPPABLE on discrete, Reviewed-by: Matthew Auld <matthew.auld@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_plane_initial.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c > index 5227e5b35206..f797fcef18fc 100644 > --- 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) && > -- > 2.34.1 >
