All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 08/12] drm/i915: Fix region start during initial plane readout
Date: Wed, 13 Dec 2023 02:42:33 +0200	[thread overview]
Message-ID: <20231213004237.20375-9-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20231213004237.20375-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

On MTL the stolen region starts at offset 8MiB from the start of
LMEMBAR. The dma addresses are thus also offset by 8MiB. However the
mm_node/etc. is zero based, and i915_pages_create_for_stolen() will
add the appropriate region.start into the sg dma address. So when
we do the readout we need to convert the dma address read from
the PTE to be zero based as well.

Note that currently we don't take this path on MTL, but we should
and thus this needs to be fixed. For lmem this works correctly
already as the lmem region.start==0.

While at it let's also make sure the address points to somewhere within
the memory region. We don't need to check the size as
i915_gem_object_create_region_at() should later fail if the object size
exceeds the region size.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_plane_initial.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index ffc92b18fcf5..db594ccf0323 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -79,16 +79,18 @@ initial_plane_vma(struct drm_i915_private *i915,
 		 * We don't currently expect this to ever be placed in the
 		 * stolen portion.
 		 */
-		if (phys_base >= resource_size(&mem->region)) {
+		if (phys_base < mem->region.start || phys_base > mem->region.end) {
 			drm_err(&i915->drm,
-				"Initial plane programming using invalid range, phys_base=%pa\n",
-				&phys_base);
+				"Initial plane programming using invalid range, phys_base=%pa (%s [%pa-%pa])\n",
+				&phys_base, mem->region.name, &mem->region.start, &mem->region.end);
 			return NULL;
 		}
 
 		drm_dbg(&i915->drm,
 			"Using phys_base=%pa, based on initial plane programming\n",
 			&phys_base);
+
+		phys_base -= mem->region.start;
 	} else {
 		phys_base = base;
 		mem = i915->mm.stolen_region;
-- 
2.41.0


  parent reply	other threads:[~2023-12-13  0:43 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-13  0:42 [PATCH 00/12] drm/i915: (stolen) memory region related fixes Ville Syrjala
2023-12-13  0:42 ` [PATCH 01/12] drm/i915: Use struct resource for memory region IO as well Ville Syrjala
2023-12-13  0:59   ` Ville Syrjälä
2023-12-13 17:01     ` Ville Syrjälä
2023-12-13 15:52   ` Andrzej Hajda
2023-12-13 16:08     ` Ville Syrjälä
2023-12-13  0:42 ` [PATCH 02/12] drm/i915: Print memory region info during probe Ville Syrjala
2023-12-13 16:05   ` Andrzej Hajda
2023-12-13 16:26     ` Ville Syrjälä
2023-12-13 16:49       ` Ville Syrjälä
2023-12-13  0:42 ` [PATCH 03/12] drm/i915: Remove ad-hoc lmem/stolen debugs Ville Syrjala
2023-12-13 16:06   ` Andrzej Hajda
2023-12-13  0:42 ` [PATCH 04/12] drm/i915: Bypass LMEMBAR/GTTMMADR for MTL stolen memory access Ville Syrjala
2023-12-13  9:09   ` Joonas Lahtinen
2023-12-13  9:30     ` Ville Syrjälä
2023-12-13 20:18       ` Sripada, Radhakrishna
2023-12-14  2:03         ` Ville Syrjälä
2023-12-14 21:06           ` Sripada, Radhakrishna
2023-12-15 10:23             ` Ville Syrjälä
2023-12-13  0:42 ` [PATCH 05/12] drm/i915: Disable the "binder" Ville Syrjala
2023-12-13  0:42 ` [PATCH 06/12] drm/i915: Rename the DSM/GSM registers Ville Syrjala
2023-12-13  0:42 ` [PATCH 07/12] drm/i915: Fix PTE decode during initial plane readout Ville Syrjala
2023-12-13  0:42 ` Ville Syrjala [this message]
2023-12-13  0:42 ` [PATCH 09/12] drm/i915: Fix MTL " Ville Syrjala
2023-12-13  0:42 ` [PATCH 10/12] drm/i915: s/phys_base/dma_addr/ Ville Syrjala
2023-12-13  0:42 ` [PATCH 11/12] drm/i915: Split the smem and lmem plane readout apart Ville Syrjala
2023-12-13  0:42 ` [PATCH 12/12] drm/i915: Simplify intel_initial_plane_config() calling convention Ville Syrjala
2023-12-13  1:22 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: (stolen) memory region related fixes Patchwork
2023-12-13  1:22 ` ✗ Fi.CI.SPARSE: " Patchwork
2023-12-13  1:37 ` ✗ Fi.CI.BAT: failure " Patchwork
2023-12-13 16:13   ` â " Andrzej Hajda
2023-12-13 17:24     ` Tvrtko Ursulin
2023-12-13 17:28       ` Tvrtko Ursulin
2023-12-14 11:06     ` â " Andrzej Hajda
2023-12-14 23:01       ` Ville Syrjälä
2023-12-15  8:23         ` Ville Syrjälä
2023-12-13  4:31 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: (stolen) memory region related fixes (rev2) Patchwork
2023-12-13  4:31 ` ✗ Fi.CI.SPARSE: " Patchwork
2023-12-13  4:49 ` ✗ Fi.CI.BAT: failure " Patchwork

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=20231213004237.20375-9-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /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.