summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2023-03-29 22:04:43 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2023-03-31 14:58:01 +0300
commitbd80b0dd6a431aa23b70ff91b6905c1b1eed2f9c (patch)
treed29a2457fe0619f66c180b2011ae110c93c83dd9
parent1164c92b2d13648fb156fe547dd1273111f05e3d (diff)
downloadlinux-bd80b0dd6a431aa23b70ff91b6905c1b1eed2f9c.tar.gz
linux-bd80b0dd6a431aa23b70ff91b6905c1b1eed2f9c.tar.bz2
linux-bd80b0dd6a431aa23b70ff91b6905c1b1eed2f9c.zip
drm/i915: Skip cursor when writing PLANE_CHICKEN
Cursor is not a universal plane and thus doesn't have the PLANE_CHICKEN register. Skip it. Fixes: c5de248484af ("drm/i915/dpt: Add a modparam to disable DPT via the chicken bit") Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230329190445.13456-1-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com>
-rw-r--r--drivers/gpu/drm/i915/display/intel_dpt.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c b/drivers/gpu/drm/i915/display/intel_dpt.c
index 2bf5cce232d5..b8027392144d 100644
--- a/drivers/gpu/drm/i915/display/intel_dpt.c
+++ b/drivers/gpu/drm/i915/display/intel_dpt.c
@@ -324,10 +324,14 @@ void intel_dpt_configure(struct intel_crtc *crtc)
enum pipe pipe = crtc->pipe;
enum plane_id plane_id;
- for_each_plane_id_on_crtc(crtc, plane_id)
+ for_each_plane_id_on_crtc(crtc, plane_id) {
+ if (plane_id == PLANE_CURSOR)
+ continue;
+
intel_de_rmw(i915, PLANE_CHICKEN(pipe, plane_id),
PLANE_CHICKEN_DISABLE_DPT,
i915->params.enable_dpt ? 0 : PLANE_CHICKEN_DISABLE_DPT);
+ }
} else if (DISPLAY_VER(i915) == 13) {
intel_de_rmw(i915, CHICKEN_MISC_2,
CHICKEN_MISC_DISABLE_DPT,