From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org,
Andrzej Hajda <andrzej.hajda@intel.com>,
Nirmoy Das <nirmoy.das@intel.com>,
Paz Zcharya <pazz@chromium.org>
Subject: [PATCH v4 07/16] drm/i915: Fix PTE decode during initial plane readout
Date: Sat, 3 Feb 2024 00:43:31 +0200 [thread overview]
Message-ID: <20240202224340.30647-8-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20240202224340.30647-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
When multiple pipes are enabled by the BIOS we try to read out each
in turn. But we do the readout for the second only after the inherited
vma for the first has been rebound into its original place (and thus
the PTEs have been rewritten). Unlike the BIOS we set some high caching
bits in the PTE on MTL which confuses the readout for the second plane.
Filter out the non-address bits from the PTE value appropriately to
fix this.
I suppose it might also be possible that the BIOS would already set
some caching bits as well, in which case we'd run into this same
issue already for the first plane.
TODO:
- should abstract the PTE decoding to avoid details leaking all over
- should probably do the readout for all the planes before
we touch anything (including the PTEs) so that we truly read
out the BIOS state
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Acked-by: Nirmoy Das <nirmoy.das@intel.com>
Tested-by: Paz Zcharya <pazz@chromium.org>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index a55c09cbd0e4..ffc92b18fcf5 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -72,7 +72,7 @@ initial_plane_vma(struct drm_i915_private *i915,
return NULL;
}
- phys_base = pte & I915_GTT_PAGE_MASK;
+ phys_base = pte & GEN12_GGTT_PTE_ADDR_MASK;
mem = i915->mm.regions[INTEL_REGION_LMEM_0];
/*
--
2.43.0
next prev parent reply other threads:[~2024-02-02 22:51 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-02 22:43 [PATCH v4 00/16] drm/i915: (stolen) memory region related fixes Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 01/16] drm/i915: Use struct resource for memory region IO as well Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 02/16] drm/i915: Print memory region info during probe Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 03/16] drm/i915: Remove ad-hoc lmem/stolen debugs Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 04/16] drm/i915: Bypass LMEMBAR/GTTMMADR for MTL stolen memory access Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 05/16] drm/i915: Disable the "binder" Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 06/16] drm/i915: Rename the DSM/GSM registers Ville Syrjala
2024-02-02 22:43 ` Ville Syrjala [this message]
2024-02-02 22:43 ` [PATCH v4 08/16] drm/i915: Fix region start during initial plane readout Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 09/16] drm/i915: Fix MTL " Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 10/16] drm/i915: s/phys_base/dma_addr/ Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 11/16] drm/i915: Split the smem and lmem plane readout apart Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 12/16] drm/i915: Simplify intel_initial_plane_config() calling convention Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 13/16] drm/i915/fbdev: Fix smem_start for LMEMBAR stolen objects Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 14/16] drm/i915: Tweak BIOS fb reuse check Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 15/16] drm/i915: Try to relocate the BIOS fb to the start of ggtt Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 16/16] drm/i915: Annotate more of the BIOS fb takeover failure paths Ville Syrjala
2024-02-03 0:33 ` ✓ CI.Patch_applied: success for drm/i915: (stolen) memory region related fixes Patchwork
2024-02-03 0:33 ` ✗ CI.checkpatch: warning " Patchwork
2024-02-03 0:34 ` ✓ CI.KUnit: success " Patchwork
2024-02-03 0:41 ` ✓ CI.Build: " Patchwork
2024-02-03 0:42 ` ✓ CI.Hooks: " Patchwork
2024-02-03 0:43 ` ✗ CI.checksparse: warning " Patchwork
2024-02-03 1:07 ` ✓ CI.BAT: success " Patchwork
2024-02-05 11:38 ` [PATCH v4 00/16] " Jani Nikula
2024-02-05 14:16 ` Lucas De Marchi
2024-02-05 14:37 ` Saarinen, Jani
2024-02-07 0:12 ` Ville Syrjälä
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=20240202224340.30647-8-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=andrzej.hajda@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=nirmoy.das@intel.com \
--cc=pazz@chromium.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox