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

drm/i915: Use intel_ggtt_read_entry() in the BIOS FB takeover 



Use intel_ggtt_read_entry() instead of open coding the PTE
read/decode in the BIOS FB takeover code. So far this codepath
only covers platforms with LMEMBAR.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250313140838.29742-6-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
parent d1b14231

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

+10 −7
Original line number Diff line number Diff line
@@ -57,24 +57,27 @@ initial_plane_phys_lmem(struct intel_display *display, 
			struct intel_initial_plane_config *plane_config)

{

	struct drm_i915_private *i915 = to_i915(display->drm);

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

	struct i915_ggtt *ggtt = to_gt(i915)->ggtt;

	struct intel_memory_region *mem;

	bool is_present, is_local;

	dma_addr_t dma_addr;

	gen8_pte_t pte;

	u32 base;



	base = round_down(plane_config->base, I915_GTT_MIN_ALIGNMENT);



	gte += base / I915_GTT_PAGE_SIZE;

	dma_addr = intel_ggtt_read_entry(&ggtt->vm, base, &is_present, &is_local);



	pte = ioread64(gte);

	if (!(pte & GEN12_GGTT_PTE_LM)) {

	if (!is_present) {

		drm_err(display->drm,

			"Initial plane programming missing PTE_LM bit\n");

			"Initial plane FB PTE not present\n");

		return false;

	}



	dma_addr = pte & GEN12_GGTT_PTE_ADDR_MASK;

	if (!is_local) {

		drm_err(display->drm,

			"Initial plane FB PTE not LMEM\n");

		return false;

	}



	if (IS_DGFX(i915))

		mem = i915->mm.regions[INTEL_REGION_LMEM_0];