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 06/12] drm/i915: Rename the DSM/GSM registers
Date: Wed, 13 Dec 2023 02:42:31 +0200	[thread overview]
Message-ID: <20231213004237.20375-7-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>

0x108100 and 0x1080c0 have been around since snb. Rename the
defines appropriately.

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

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
index 252fe5cd6ede..6185a5f73a48 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
@@ -935,7 +935,7 @@ i915_gem_stolen_lmem_setup(struct drm_i915_private *i915, u16 type,
 		GEM_BUG_ON((dsm_base + dsm_size) > lmem_size);
 	} else {
 		/* Use DSM base address instead for stolen memory */
-		dsm_base = intel_uncore_read64(uncore, GEN12_DSMBASE) & GEN12_BDSM_MASK;
+		dsm_base = intel_uncore_read64(uncore, GEN6_DSMBASE) & GEN11_BDSM_MASK;
 		if (WARN_ON(lmem_size < dsm_base))
 			return ERR_PTR(-ENODEV);
 		dsm_size = ALIGN_DOWN(lmem_size - dsm_base, SZ_1M);
@@ -948,7 +948,7 @@ i915_gem_stolen_lmem_setup(struct drm_i915_private *i915, u16 type,
 		 * 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_start = intel_uncore_read64(uncore, GEN6_DSMBASE) & GEN11_BDSM_MASK;
 		io_size = dsm_size;
 	} else if (pci_resource_len(pdev, GEN12_LMEM_BAR) < lmem_size) {
 		io_start = 0;
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index ab71d74ec426..05c5525e7e2d 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -1167,7 +1167,7 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
 	 * should have relaxed the access permissions sufficiently.
 	 */
 	if (IS_METEORLAKE(i915))
-		phys_addr = intel_uncore_read64(uncore, GEN12_GSMBASE) & GEN12_BDSM_MASK;
+		phys_addr = intel_uncore_read64(uncore, GEN6_GSMBASE) & GEN11_BDSM_MASK;
 	else
 		phys_addr = pci_resource_start(pdev, GEN4_GTTMMADR_BAR) + gen6_gttadr_offset(i915);
 
diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
index af357089da6e..51bb27e10a4f 100644
--- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
+++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
@@ -240,7 +240,7 @@ static struct intel_memory_region *setup_lmem(struct intel_gt *gt)
 		lmem_size -= tile_stolen;
 	} else {
 		/* Stolen starts from GSMBASE without CCS */
-		lmem_size = intel_uncore_read64(&i915->uncore, GEN12_GSMBASE);
+		lmem_size = intel_uncore_read64(&i915->uncore, GEN6_GSMBASE);
 	}
 
 	i915_resize_lmem_bar(i915, lmem_size);
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 27dc903f0553..b54d62952a53 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -6314,9 +6314,10 @@ enum skl_power_gate {
 #define   GMS_MASK			REG_GENMASK(15, 8)
 #define   GGMS_MASK			REG_GENMASK(7, 6)
 
-#define GEN12_GSMBASE			_MMIO(0x108100)
-#define GEN12_DSMBASE			_MMIO(0x1080C0)
-#define   GEN12_BDSM_MASK		REG_GENMASK64(63, 20)
+#define GEN6_GSMBASE			_MMIO(0x108100)
+#define GEN6_DSMBASE			_MMIO(0x1080C0)
+#define   GEN6_BDSM_MASK		REG_GENMASK64(31, 20)
+#define   GEN11_BDSM_MASK		REG_GENMASK64(63, 20)
 
 #define XEHP_CLOCK_GATE_DIS		_MMIO(0x101014)
 #define   SGSI_SIDECLK_DIS		REG_BIT(17)
-- 
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 ` Ville Syrjala [this message]
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-7-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.