]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/i915: Fix SEL_FETCH_{SIZE,OFFSET} registers
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 24 May 2024 15:50:00 +0000 (18:50 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 27 May 2024 11:03:25 +0000 (14:03 +0300)
Fix up the SEL_FETCH_{SIZE,OFFSET} registers. A classic
copy-paste fail on my part.

I even had a small test to confirm that the old and new register
offsets match, but somehow I must have screwed things up when
running it, and likely just ended up comparing the old defines
against themselves :/

Cc: Jani Nikula <jani.nikula@intel.com>
Fixes: 4bfa8a140db3 ("drm/i915: Define SEL_FETCH_PLANE registers via PICK_EVEN_2RANGES()")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240524155000.13358-1-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/skl_universal_plane_regs.h

index 9904ecc54128eb2b9754063a82b0cb7437ff6299..4ddcd7d46bbdeaf147984da8610c0728f6886fb8 100644 (file)
 #define _SEL_FETCH_PLANE_SIZE_5_B              0x71928
 #define _SEL_FETCH_PLANE_SIZE_6_B              0x71948
 #define SEL_FETCH_PLANE_SIZE(pipe, plane)      _MMIO_SEL_FETCH((pipe), (plane),\
-                                                               _SEL_FETCH_PLANE_POS_1_A, _SEL_FETCH_PLANE_POS_1_B, \
-                                                               _SEL_FETCH_PLANE_POS_2_A, _SEL_FETCH_PLANE_POS_2_B, \
-                                                               _SEL_FETCH_PLANE_POS_5_A, _SEL_FETCH_PLANE_POS_5_B, \
-                                                               _SEL_FETCH_PLANE_POS_6_A, _SEL_FETCH_PLANE_POS_6_B)
+                                                               _SEL_FETCH_PLANE_SIZE_1_A, _SEL_FETCH_PLANE_SIZE_1_B, \
+                                                               _SEL_FETCH_PLANE_SIZE_2_A, _SEL_FETCH_PLANE_SIZE_2_B, \
+                                                               _SEL_FETCH_PLANE_SIZE_5_A, _SEL_FETCH_PLANE_SIZE_5_B, \
+                                                               _SEL_FETCH_PLANE_SIZE_6_A, _SEL_FETCH_PLANE_SIZE_6_B)
 
 /* tgl+ */
 #define _SEL_FETCH_PLANE_OFFSET_1_A            0x7089c
 #define _SEL_FETCH_PLANE_OFFSET_5_B            0x7192c
 #define _SEL_FETCH_PLANE_OFFSET_6_B            0x7194c
 #define SEL_FETCH_PLANE_OFFSET(pipe, plane)    _MMIO_SEL_FETCH((pipe), (plane),\
-                                                               _SEL_FETCH_PLANE_POS_1_A, _SEL_FETCH_PLANE_POS_1_B, \
-                                                               _SEL_FETCH_PLANE_POS_2_A, _SEL_FETCH_PLANE_POS_2_B, \
-                                                               _SEL_FETCH_PLANE_POS_5_A, _SEL_FETCH_PLANE_POS_5_B, \
-                                                               _SEL_FETCH_PLANE_POS_6_A, _SEL_FETCH_PLANE_POS_6_B)
+                                                               _SEL_FETCH_PLANE_OFFSET_1_A, _SEL_FETCH_PLANE_OFFSET_1_B, \
+                                                               _SEL_FETCH_PLANE_OFFSET_2_A, _SEL_FETCH_PLANE_OFFSET_2_B, \
+                                                               _SEL_FETCH_PLANE_OFFSET_5_A, _SEL_FETCH_PLANE_OFFSET_5_B, \
+                                                               _SEL_FETCH_PLANE_OFFSET_6_A, _SEL_FETCH_PLANE_OFFSET_6_B)
 
 #endif /* __SKL_UNIVERSAL_PLANE_REGS_H__ */