Commit f8ae1d52 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Rename the DSM/GSM registers 



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

v2: Rebase

Reviewed-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Acked-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Tested-by: default avatarPaz Zcharya <pazz@chromium.org>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240202224340.30647-7-ville.syrjala@linux.intel.com
parent be5e8dc8

drivers/gpu/drm/i915/gem/i915_gem_stolen.c

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -943,7 +943,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;

	} else if (pci_resource_len(pdev, GEN12_LMEM_BAR) < lmem_size) {

		io_start = 0;

drivers/gpu/drm/i915/gt/intel_ggtt.c

+1 −1
Original line number Diff line number Diff line
@@ -1163,7 +1163,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);

	}

drivers/gpu/drm/i915/gt/intel_region_lmem.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/i915_reg.h

+4 −3
Original line number Diff line number Diff line
@@ -6325,9 +6325,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)