mirror of https://github.com/torvalds/linux.git
drm/i915: Define SEL_FETCH_PLANE registers via PICK_EVEN_2RANGES()
Instead of that huge _PICK() let's use PICK_EVEN_2RANGES() for the SEL_FETCH_PLANE registers. A bit more tedious to have to define 8 raw register offsets for everything, but perhaps a bit easier to understand since we use a standard mechanism now instead of hand rolling the arithmetic. Also bloat-o-meter says: add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-326 (-326) Function old new delta icl_plane_update_arm 510 446 -64 icl_plane_disable_sel_fetch_arm.isra 158 54 -104 icl_plane_update_noarm 1898 1740 -158 Total: Before=2574502, After=2574176, chg -0.01% v2: s/mtl+/tgl+/ comments to reflect actual reality Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240516135622.3498-7-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Ville Syrjälä
parent
a9940ce97d
commit
4bfa8a140d
|
|
@ -255,51 +255,6 @@
|
|||
#define _PIPE_SRCSZ_ERLY_TPT_B 0x71074
|
||||
#define PIPE_SRCSZ_ERLY_TPT(pipe) _MMIO_PIPE((pipe), _PIPE_SRCSZ_ERLY_TPT_A, _PIPE_SRCSZ_ERLY_TPT_B)
|
||||
|
||||
#define _SEL_FETCH_PLANE_BASE_1_A 0x70890
|
||||
#define _SEL_FETCH_PLANE_BASE_2_A 0x708B0
|
||||
#define _SEL_FETCH_PLANE_BASE_3_A 0x708D0
|
||||
#define _SEL_FETCH_PLANE_BASE_4_A 0x708F0
|
||||
#define _SEL_FETCH_PLANE_BASE_5_A 0x70920
|
||||
#define _SEL_FETCH_PLANE_BASE_6_A 0x70940
|
||||
#define _SEL_FETCH_PLANE_BASE_7_A 0x70960
|
||||
#define _SEL_FETCH_PLANE_BASE_CUR_A 0x70880
|
||||
#define _SEL_FETCH_PLANE_BASE_1_B 0x71890
|
||||
|
||||
#define _SEL_FETCH_PLANE_BASE_A(plane) _PICK(plane, \
|
||||
_SEL_FETCH_PLANE_BASE_1_A, \
|
||||
_SEL_FETCH_PLANE_BASE_2_A, \
|
||||
_SEL_FETCH_PLANE_BASE_3_A, \
|
||||
_SEL_FETCH_PLANE_BASE_4_A, \
|
||||
_SEL_FETCH_PLANE_BASE_5_A, \
|
||||
_SEL_FETCH_PLANE_BASE_6_A, \
|
||||
_SEL_FETCH_PLANE_BASE_7_A, \
|
||||
_SEL_FETCH_PLANE_BASE_CUR_A)
|
||||
#define _SEL_FETCH_PLANE_BASE_1(pipe) _PIPE(pipe, _SEL_FETCH_PLANE_BASE_1_A, _SEL_FETCH_PLANE_BASE_1_B)
|
||||
#define _SEL_FETCH_PLANE_BASE(pipe, plane) (_SEL_FETCH_PLANE_BASE_1(pipe) - \
|
||||
_SEL_FETCH_PLANE_BASE_1_A + \
|
||||
_SEL_FETCH_PLANE_BASE_A(plane))
|
||||
|
||||
#define _SEL_FETCH_PLANE_CTL_1_A 0x70890
|
||||
#define SEL_FETCH_PLANE_CTL(pipe, plane) _MMIO(_SEL_FETCH_PLANE_BASE(pipe, plane) + \
|
||||
_SEL_FETCH_PLANE_CTL_1_A - \
|
||||
_SEL_FETCH_PLANE_BASE_1_A)
|
||||
#define SEL_FETCH_PLANE_CTL_ENABLE REG_BIT(31)
|
||||
|
||||
#define _SEL_FETCH_PLANE_POS_1_A 0x70894
|
||||
#define SEL_FETCH_PLANE_POS(pipe, plane) _MMIO(_SEL_FETCH_PLANE_BASE(pipe, plane) + \
|
||||
_SEL_FETCH_PLANE_POS_1_A - \
|
||||
_SEL_FETCH_PLANE_BASE_1_A)
|
||||
|
||||
#define _SEL_FETCH_PLANE_SIZE_1_A 0x70898
|
||||
#define SEL_FETCH_PLANE_SIZE(pipe, plane) _MMIO(_SEL_FETCH_PLANE_BASE(pipe, plane) + \
|
||||
_SEL_FETCH_PLANE_SIZE_1_A - \
|
||||
_SEL_FETCH_PLANE_BASE_1_A)
|
||||
|
||||
#define _SEL_FETCH_PLANE_OFFSET_1_A 0x7089C
|
||||
#define SEL_FETCH_PLANE_OFFSET(pipe, plane) _MMIO(_SEL_FETCH_PLANE_BASE(pipe, plane) + \
|
||||
_SEL_FETCH_PLANE_OFFSET_1_A - \
|
||||
_SEL_FETCH_PLANE_BASE_1_A)
|
||||
|
||||
#define _ALPM_CTL_A 0x60950
|
||||
#define ALPM_CTL(dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _ALPM_CTL_A)
|
||||
#define ALPM_CTL_ALPM_ENABLE REG_BIT(31)
|
||||
|
|
|
|||
|
|
@ -17,6 +17,17 @@
|
|||
#define _MMIO_SKL_PLANE_DW(pipe, plane, dw, reg_1_a, reg_1_b, reg_2_a, reg_2_b) \
|
||||
_MMIO(_SKL_PLANE_DW((pipe), (plane), (dw), (reg_1_a), (reg_1_b), (reg_2_a), (reg_2_b)))
|
||||
|
||||
#define _SEL_FETCH(pipe, plane, reg_1_a, reg_1_b, reg_2_a, reg_2_b, reg_5_a, reg_5_b, reg_6_a, reg_6_b) \
|
||||
_PICK_EVEN_2RANGES((plane), PLANE_5, \
|
||||
_PIPE((pipe), (reg_1_a), (reg_1_b)), \
|
||||
_PIPE((pipe), (reg_2_a), (reg_2_b)), \
|
||||
_PIPE((pipe), (reg_5_a), (reg_5_b)), \
|
||||
_PIPE((pipe), (reg_6_a), (reg_6_b)))
|
||||
#define _MMIO_SEL_FETCH(pipe, plane, reg_1_a, reg_1_b, reg_2_a, reg_2_b, reg_5_a, reg_5_b, reg_6_a, reg_6_b) \
|
||||
_MMIO(_SEL_FETCH((pipe), (plane), \
|
||||
(reg_1_a), (reg_1_b), (reg_2_a), (reg_2_b), \
|
||||
(reg_5_a), (reg_5_b), (reg_6_a), (reg_6_b)))
|
||||
|
||||
#define _PLANE_CTL_1_A 0x70180
|
||||
#define _PLANE_CTL_2_A 0x70280
|
||||
#define _PLANE_CTL_1_B 0x71180
|
||||
|
|
@ -367,4 +378,65 @@
|
|||
#define PLANE_BUF_START_MASK REG_GENMASK(11, 0)
|
||||
#define PLANE_BUF_START(start) REG_FIELD_PREP(PLANE_BUF_START_MASK, (start))
|
||||
|
||||
/* tgl+ */
|
||||
#define _SEL_FETCH_PLANE_CTL_1_A 0x70890
|
||||
#define _SEL_FETCH_PLANE_CTL_2_A 0x708b0
|
||||
#define _SEL_FETCH_PLANE_CTL_5_A 0x70920
|
||||
#define _SEL_FETCH_PLANE_CTL_6_A 0x70940
|
||||
#define _SEL_FETCH_PLANE_CTL_1_B 0x71890
|
||||
#define _SEL_FETCH_PLANE_CTL_2_B 0x718b0
|
||||
#define _SEL_FETCH_PLANE_CTL_5_B 0x71920
|
||||
#define _SEL_FETCH_PLANE_CTL_6_B 0x71940
|
||||
#define SEL_FETCH_PLANE_CTL(pipe, plane) _MMIO_SEL_FETCH((pipe), (plane),\
|
||||
_SEL_FETCH_PLANE_CTL_1_A, _SEL_FETCH_PLANE_CTL_1_B, \
|
||||
_SEL_FETCH_PLANE_CTL_2_A, _SEL_FETCH_PLANE_CTL_2_B, \
|
||||
_SEL_FETCH_PLANE_CTL_5_A, _SEL_FETCH_PLANE_CTL_5_B, \
|
||||
_SEL_FETCH_PLANE_CTL_6_A, _SEL_FETCH_PLANE_CTL_6_B)
|
||||
#define SEL_FETCH_PLANE_CTL_ENABLE REG_BIT(31)
|
||||
|
||||
/* tgl+ */
|
||||
#define _SEL_FETCH_PLANE_POS_1_A 0x70894
|
||||
#define _SEL_FETCH_PLANE_POS_2_A 0x708b4
|
||||
#define _SEL_FETCH_PLANE_POS_5_A 0x70924
|
||||
#define _SEL_FETCH_PLANE_POS_6_A 0x70944
|
||||
#define _SEL_FETCH_PLANE_POS_1_B 0x71894
|
||||
#define _SEL_FETCH_PLANE_POS_2_B 0x718b4
|
||||
#define _SEL_FETCH_PLANE_POS_5_B 0x71924
|
||||
#define _SEL_FETCH_PLANE_POS_6_B 0x71944
|
||||
#define SEL_FETCH_PLANE_POS(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)
|
||||
|
||||
/* tgl+ */
|
||||
#define _SEL_FETCH_PLANE_SIZE_1_A 0x70898
|
||||
#define _SEL_FETCH_PLANE_SIZE_2_A 0x708b8
|
||||
#define _SEL_FETCH_PLANE_SIZE_5_A 0x70928
|
||||
#define _SEL_FETCH_PLANE_SIZE_6_A 0x70948
|
||||
#define _SEL_FETCH_PLANE_SIZE_1_B 0x71898
|
||||
#define _SEL_FETCH_PLANE_SIZE_2_B 0x718b8
|
||||
#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)
|
||||
|
||||
/* tgl+ */
|
||||
#define _SEL_FETCH_PLANE_OFFSET_1_A 0x7089c
|
||||
#define _SEL_FETCH_PLANE_OFFSET_2_A 0x708bc
|
||||
#define _SEL_FETCH_PLANE_OFFSET_5_A 0x7092c
|
||||
#define _SEL_FETCH_PLANE_OFFSET_6_A 0x7094c
|
||||
#define _SEL_FETCH_PLANE_OFFSET_1_B 0x7189c
|
||||
#define _SEL_FETCH_PLANE_OFFSET_2_B 0x718bc
|
||||
#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)
|
||||
|
||||
#endif /* __SKL_UNIVERSAL_PLANE_REGS_H__ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue