drm/i915: Rename the DSM/GSM registers

From Ville Syrjala
f8ae1d5291c3e06d494cf59005c23d883f1afc0e in mainline linux

diff --git a/sys/dev/pci/drm/i915/gem/i915_gem_stolen.c b/sys/dev/pci/drm/i915/gem/i915_gem_stolen.c
index 1fdadbd..790e00c 100644 (file)
--- a/sys/dev/pci/drm/i915/gem/i915_gem_stolen.c
+++ b/sys/dev/pci/drm/i915/gem/i915_gem_stolen.c
@@ -984,7 +984,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);
@@ -992,7 +992,7 @@ i915_gem_stolen_lmem_setup(struct drm_i915_private *i915, u16 type,
 
        if (i915_direct_stolen_access(i915)) {
                drm_dbg(&i915->drm, "Using direct DSM access\n");
-               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;
 #ifdef __linux__
        } else if (pci_resource_len(pdev, GEN12_LMEM_BAR) < lmem_size) {

diff --git a/sys/dev/pci/drm/i915/gt/intel_ggtt.c b/sys/dev/pci/drm/i915/gt/intel_ggtt.c
index 14818a3..ba90ccf 100644 (file)
--- a/sys/dev/pci/drm/i915/gt/intel_ggtt.c
+++ b/sys/dev/pci/drm/i915/gt/intel_ggtt.c
@@ -1182,7 +1182,7 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
 
        if (i915_direct_stolen_access(i915)) {
                drm_dbg(&i915->drm, "Using direct GSM access\n");
-               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);
        }
@@ -1244,7 +1244,7 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
 
        if (i915_direct_stolen_access(i915)) {
                drm_dbg(&i915->drm, "Using direct GSM access\n");
-               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 = addr + gen6_gttadr_offset(i915);
        }

diff --git a/sys/dev/pci/drm/i915/gt/intel_region_lmem.c b/sys/dev/pci/drm/i915/gt/intel_region_lmem.c
index 17f6d07..064ca0f 100644 (file)
--- a/sys/dev/pci/drm/i915/gt/intel_region_lmem.c
+++ b/sys/dev/pci/drm/i915/gt/intel_region_lmem.c
@@ -280,7 +280,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/sys/dev/pci/drm/i915/i915_reg.h b/sys/dev/pci/drm/i915/i915_reg.h
index 3862863..ad0bfce 100644 (file)
--- a/sys/dev/pci/drm/i915/i915_reg.h
+++ b/sys/dev/pci/drm/i915/i915_reg.h
@@ -6584,9 +6584,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)