tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915: move PCH DP AUX CH regs to intel_dp_aux_regs.h
Move the macros where they belong.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9bc3a7bb34edc5dc17ffcb2a9e64edcef8c7a7b8.1716894910.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+8
-7
+8
drivers/gpu/drm/i915/display/intel_dp_aux_regs.h
+8
drivers/gpu/drm/i915/display/intel_dp_aux_regs.h
···
28
28
#define VLV_DP_AUX_CH_CTL(aux_ch) _MMIO(VLV_DISPLAY_BASE + \
29
29
_PORT(aux_ch, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL))
30
30
31
+
#define _PCH_DPB_AUX_CH_CTL 0xe4110
32
+
#define _PCH_DPC_AUX_CH_CTL 0xe4210
33
+
#define PCH_DP_AUX_CH_CTL(aux_ch) _MMIO_PORT((aux_ch) - AUX_CH_B, _PCH_DPB_AUX_CH_CTL, _PCH_DPC_AUX_CH_CTL)
34
+
31
35
#define _XELPDP_USBC1_AUX_CH_CTL 0x16f210
32
36
#define _XELPDP_USBC2_AUX_CH_CTL 0x16f410
33
37
#define _XELPDP_DP_AUX_CH_CTL(aux_ch) \
···
81
77
_DPB_AUX_CH_DATA1) + (i) * 4) /* 5 registers */
82
78
#define VLV_DP_AUX_CH_DATA(aux_ch, i) _MMIO(VLV_DISPLAY_BASE + _PORT(aux_ch, _DPA_AUX_CH_DATA1, \
83
79
_DPB_AUX_CH_DATA1) + (i) * 4) /* 5 registers */
80
+
81
+
#define _PCH_DPB_AUX_CH_DATA1 0xe4114
82
+
#define _PCH_DPC_AUX_CH_DATA1 0xe4214
83
+
#define PCH_DP_AUX_CH_DATA(aux_ch, i) _MMIO(_PORT((aux_ch) - AUX_CH_B, _PCH_DPB_AUX_CH_DATA1, _PCH_DPC_AUX_CH_DATA1) + (i) * 4) /* 5 registers */
84
84
85
85
#define _XELPDP_USBC1_AUX_CH_DATA1 0x16f214
86
86
#define _XELPDP_USBC2_AUX_CH_DATA1 0x16f414
-7
drivers/gpu/drm/i915/i915_reg.h
-7
drivers/gpu/drm/i915/i915_reg.h
···
3601
3601
3602
3602
#define _PCH_DP_B 0xe4100
3603
3603
#define PCH_DP_B _MMIO(_PCH_DP_B)
3604
-
#define _PCH_DPB_AUX_CH_CTL 0xe4110
3605
-
#define _PCH_DPB_AUX_CH_DATA1 0xe4114
3606
3604
3607
3605
#define _PCH_DP_C 0xe4200
3608
3606
#define PCH_DP_C _MMIO(_PCH_DP_C)
3609
-
#define _PCH_DPC_AUX_CH_CTL 0xe4210
3610
-
#define _PCH_DPC_AUX_CH_DATA1 0xe4214
3611
3607
3612
3608
#define _PCH_DP_D 0xe4300
3613
3609
#define PCH_DP_D _MMIO(_PCH_DP_D)
3614
-
3615
-
#define PCH_DP_AUX_CH_CTL(aux_ch) _MMIO_PORT((aux_ch) - AUX_CH_B, _PCH_DPB_AUX_CH_CTL, _PCH_DPC_AUX_CH_CTL)
3616
-
#define PCH_DP_AUX_CH_DATA(aux_ch, i) _MMIO(_PORT((aux_ch) - AUX_CH_B, _PCH_DPB_AUX_CH_DATA1, _PCH_DPC_AUX_CH_DATA1) + (i) * 4) /* 5 registers */
3617
3610
3618
3611
/* CPT */
3619
3612
#define _TRANS_DP_CTL_A 0xe0300