]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915: Reoder gen9+ timestamp freq register bits
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 11 Feb 2025 23:19:40 +0000 (01:19 +0200)
committerAndi Shyti <andi.shyti@linux.intel.com>
Tue, 4 Mar 2025 14:39:38 +0000 (15:39 +0100)
We customarily define the bits of a register in big endian
order. Reorder the gen9+ timestamp freq register bits to match.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250211231941.22769-13-ville.syrjala@linux.intel.com
drivers/gpu/drm/i915/gt/intel_gt_regs.h

index bbb2e14261467b28bcd3685359974b730b62777b..7421ed18d8d1daf389bdb3545551e67acb635ef5 100644 (file)
 
 /* RPM unit config (Gen8+) */
 #define RPM_CONFIG0                            _MMIO(0xd00)
-#define   GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK     REG_BIT(3)
-#define   GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ REG_FIELD_PREP(GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK, 0)
-#define   GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ   REG_FIELD_PREP(GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK, 1)
 #define   GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK    REG_GENMASK(5, 3)
 #define   GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ  REG_FIELD_PREP(GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK, 0)
 #define   GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ        REG_FIELD_PREP(GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK, 1)
 #define   GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_38_4_MHZ        REG_FIELD_PREP(GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK, 2)
 #define   GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_25_MHZ  REG_FIELD_PREP(GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK, 3)
+#define   GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK     REG_BIT(3)
+#define   GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ REG_FIELD_PREP(GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK, 0)
+#define   GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ   REG_FIELD_PREP(GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK, 1)
 #define   GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_MASK   REG_GENMASK(2, 1)
 
 #define RPM_CONFIG1                            _MMIO(0xd04)
 
 /* GPM unit config (Gen9+) */
 #define CTC_MODE                               _MMIO(0xa26c)
+#define   CTC_SHIFT_PARAMETER_MASK             REG_GENMASK(2, 1)
 #define   CTC_SOURCE_PARAMETER_MASK            REG_BIT(0)
 #define   CTC_SOURCE_CRYSTAL_CLOCK             REG_FIELD_PREP(CTC_SOURCE_PARAMETER_MASK, 0)
 #define   CTC_SOURCE_DIVIDE_LOGIC              REG_FIELD_PREP(CTC_SOURCE_PARAMETER_MASK, 1)
-#define   CTC_SHIFT_PARAMETER_MASK             REG_GENMASK(2, 1)
 
 /* GPM MSG_IDLE */
 #define MSG_IDLE_CS            _MMIO(0x8000)