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

drm/i915: s/phys_base/dma_addr/ 



The address we read from the PTE is a dma address, not a physical
address. Rename the variable to say so.

Reviewed-by: default avatarAndrzej Hajda <andrzej.hajda@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-11-ville.syrjala@linux.intel.com
parent f46fb694

drivers/gpu/drm/i915/display/intel_plane_initial.c

+8 −7
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ initial_plane_vma(struct drm_i915_private *i915, 
	base = round_down(plane_config->base, I915_GTT_MIN_ALIGNMENT);

	if (IS_DGFX(i915) || HAS_LMEMBAR_SMEM_STOLEN(i915)) {

		gen8_pte_t __iomem *gte = to_gt(i915)->ggtt->gsm;

		dma_addr_t dma_addr;

		gen8_pte_t pte;



		gte += base / I915_GTT_PAGE_SIZE;
@@ -72,7 +73,7 @@ initial_plane_vma(struct drm_i915_private *i915, 
			return NULL;

		}



		phys_base = pte & GEN12_GGTT_PTE_ADDR_MASK;

		dma_addr = pte & GEN12_GGTT_PTE_ADDR_MASK;



		if (IS_DGFX(i915))

			mem = i915->mm.regions[INTEL_REGION_LMEM_0];
@@ -88,18 +89,18 @@ initial_plane_vma(struct drm_i915_private *i915, 
		 * On lmem we don't currently expect this to

		 * ever be placed in the stolen portion.

		 */

		if (phys_base < mem->region.start || phys_base > mem->region.end) {

		if (dma_addr < mem->region.start || dma_addr > mem->region.end) {

			drm_err(&i915->drm,

				"Initial plane programming using invalid range, phys_base=%pa (%s [%pa-%pa])\n",

				&phys_base, mem->region.name, &mem->region.start, &mem->region.end);

				"Initial plane programming using invalid range, dma_addr=%pa (%s [%pa-%pa])\n",

				&dma_addr, 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);

			"Using dma_addr=%pa, based on initial plane programming\n",

			&dma_addr);



		phys_base -= mem->region.start;

		phys_base = dma_addr - mem->region.start;

	} else {

		phys_base = base;

		mem = i915->mm.stolen_region;