All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	"Radhakrishna Sripada" <radhakrishna.sripada@intel.com>,
	"Ap Kamal" <kamal.ap@intel.com>,
	"Chris P Wilson" <chris.p.wilson@intel.com>,
	"CQ Tang" <cq.tang@intel.com>,
	dri-devel@lists.freedesktop.org
Subject: [PATCH v2 6/8] drm/i915/display: Check mappable aperture when pinning preallocated vma
Date: Thu, 10 Mar 2022 12:27:49 +0000	[thread overview]
Message-ID: <20220310122751.89693-7-matthew.auld@intel.com> (raw)
In-Reply-To: <20220310122751.89693-1-matthew.auld@intel.com>

From: CQ Tang <cq.tang@intel.com>

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>
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>
---
 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


WARNING: multiple messages have this Message-ID (diff)
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	"Ap Kamal" <kamal.ap@intel.com>,
	"Chris P Wilson" <chris.p.wilson@intel.com>,
	"CQ Tang" <cq.tang@intel.com>,
	dri-devel@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH v2 6/8] drm/i915/display: Check mappable aperture when pinning preallocated vma
Date: Thu, 10 Mar 2022 12:27:49 +0000	[thread overview]
Message-ID: <20220310122751.89693-7-matthew.auld@intel.com> (raw)
In-Reply-To: <20220310122751.89693-1-matthew.auld@intel.com>

From: CQ Tang <cq.tang@intel.com>

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>
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>
---
 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


  parent reply	other threads:[~2022-03-10 12:28 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-10 12:27 [PATCH v2 0/8] Some more bits for small BAR enabling Matthew Auld
2022-03-10 12:27 ` [Intel-gfx] " Matthew Auld
2022-03-10 12:27 ` [PATCH v2 1/8] drm/i915/lmem: don't treat small BAR as an error Matthew Auld
2022-03-10 12:27   ` [Intel-gfx] " Matthew Auld
2022-03-10 12:27 ` [PATCH v2 2/8] drm/i915/stolen: " Matthew Auld
2022-03-10 12:27   ` [Intel-gfx] " Matthew Auld
2022-03-10 12:27 ` [PATCH v2 3/8] drm/i915/stolen: consider I915_BO_ALLOC_GPU_ONLY Matthew Auld
2022-03-10 12:27   ` [Intel-gfx] " Matthew Auld
2022-03-10 12:27 ` [PATCH v2 4/8] drm/i915: add i915_gem_object_create_region_at() Matthew Auld
2022-03-10 12:27   ` [Intel-gfx] " Matthew Auld
2022-03-10 12:27 ` [PATCH v2 5/8] drm/i915/ttm: wire up the object offset Matthew Auld
2022-03-10 12:27   ` [Intel-gfx] " Matthew Auld
2022-03-10 12:27 ` Matthew Auld [this message]
2022-03-10 12:27   ` [Intel-gfx] [PATCH v2 6/8] drm/i915/display: Check mappable aperture when pinning preallocated vma Matthew Auld
2022-03-11 11:06   ` Matthew Auld
2022-03-10 12:27 ` [PATCH v2 7/8] drm/i915: fixup the initial fb base on DG1 Matthew Auld
2022-03-10 12:27   ` [Intel-gfx] " Matthew Auld
2022-03-10 12:27 ` [PATCH v2 8/8] drm/i915: fixup the initial fb on DG2 Matthew Auld
2022-03-10 12:27   ` [Intel-gfx] " Matthew Auld
2022-03-10 12:59 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Some more bits for small BAR enabling (rev2) Patchwork
2022-03-10 13:30 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2022-03-10 17:10 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Some more bits for small BAR enabling (rev3) Patchwork
2022-03-10 17:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-03-10 22:01 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-03-11 10:55 ` [Intel-gfx] [PATCH v2 0/8] Some more bits for small BAR enabling Das, Nirmoy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220310122751.89693-7-matthew.auld@intel.com \
    --to=matthew.auld@intel.com \
    --cc=chris.p.wilson@intel.com \
    --cc=cq.tang@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=kamal.ap@intel.com \
    --cc=radhakrishna.sripada@intel.com \
    --cc=thomas.hellstrom@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.