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 04/12] drm/i915: Bypass LMEMBAR/GTTMMADR for MTL stolen memory access
Date: Wed, 13 Dec 2023 02:42:29 +0200	[thread overview]
Message-ID: <20231213004237.20375-5-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 accessing stolen memory via the BARs is somehow borked,
and it can hang the machine. As a workaround let's bypass the
BARs and just go straight to DSMBASE/GSMBASE instead.

Note that on every other platform this itself would hang the
machine, but on MTL the system firmware is expected to relax
the access permission guarding stolen memory to enable this
workaround, and thus direct CPU accesses should be fine.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 11 ++++++++++-
 drivers/gpu/drm/i915/gt/intel_ggtt.c       | 13 ++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
index ee237043c302..252fe5cd6ede 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
@@ -941,7 +941,16 @@ i915_gem_stolen_lmem_setup(struct drm_i915_private *i915, u16 type,
 		dsm_size = ALIGN_DOWN(lmem_size - dsm_base, SZ_1M);
 	}
 
-	if (pci_resource_len(pdev, GEN12_LMEM_BAR) < lmem_size) {
+	if (IS_METEORLAKE(i915)) {
+		/*
+		 * Workaround: access via BAR can hang MTL, go directly to DSM.
+		 *
+		 * Normally this would not work but on MTL the system firmware
+		 * should have relaxed the access permissions sufficiently.
+		 */
+		io_start = intel_uncore_read64(uncore, GEN12_DSMBASE) & GEN12_BDSM_MASK;
+		io_size = dsm_size;
+	} else if (pci_resource_len(pdev, GEN12_LMEM_BAR) < lmem_size) {
 		io_start = 0;
 		io_size = 0;
 	} else {
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 21a7e3191c18..ab71d74ec426 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -24,6 +24,7 @@
 #include "intel_ring.h"
 #include "i915_drv.h"
 #include "i915_pci.h"
+#include "i915_reg.h"
 #include "i915_request.h"
 #include "i915_scatterlist.h"
 #include "i915_utils.h"
@@ -1152,13 +1153,23 @@ static unsigned int gen6_gttadr_offset(struct drm_i915_private *i915)
 static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
 {
 	struct drm_i915_private *i915 = ggtt->vm.i915;
+	struct intel_uncore *uncore = ggtt->vm.gt->uncore;
 	struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
 	phys_addr_t phys_addr;
 	u32 pte_flags;
 	int ret;
 
 	GEM_WARN_ON(pci_resource_len(pdev, GEN4_GTTMMADR_BAR) != gen6_gttmmadr_size(i915));
-	phys_addr = pci_resource_start(pdev, GEN4_GTTMMADR_BAR) + gen6_gttadr_offset(i915);
+	/*
+	 * Workaround: access via BAR can hang MTL, go directly to GSM.
+	 *
+	 * Normally this would not work but on MTL the system firmware
+	 * should have relaxed the access permissions sufficiently.
+	 */
+	if (IS_METEORLAKE(i915))
+		phys_addr = intel_uncore_read64(uncore, GEN12_GSMBASE) & GEN12_BDSM_MASK;
+	else
+		phys_addr = pci_resource_start(pdev, GEN4_GTTMMADR_BAR) + gen6_gttadr_offset(i915);
 
 	if (needs_wc_ggtt_mapping(i915))
 		ggtt->gsm = ioremap_wc(phys_addr, size);
-- 
2.41.0


  parent reply	other threads:[~2023-12-13  0:42 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 ` Ville Syrjala [this message]
2023-12-13  9:09   ` [PATCH 04/12] drm/i915: Bypass LMEMBAR/GTTMMADR for MTL stolen memory access 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 ` [PATCH 08/12] drm/i915: Fix region start " Ville Syrjala
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-5-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.