> Subject: [v7 08/15] drm/i915: Add register definitions for Plane Degamma > > Add macros to define Plane Degamma registers > > v2: > - Add BSpec links (Suraj) > v3: > - Add Bspec links in trailer (Suraj) > - Fix checkpatch issues (Suraj) > > BSpec: 50411, 50412, 50413, 50414 > Signed-off-by: Uma Shankar <[email protected]> > Signed-off-by: Chaitanya Kumar Borah <[email protected]>
LGTM, Reviewed-by: Suraj Kandpal <[email protected]> > --- > .../i915/display/skl_universal_plane_regs.h | 48 +++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane_regs.h > b/drivers/gpu/drm/i915/display/skl_universal_plane_regs.h > index 6f815b231340..1e5d7ef37f1c 100644 > --- a/drivers/gpu/drm/i915/display/skl_universal_plane_regs.h > +++ b/drivers/gpu/drm/i915/display/skl_universal_plane_regs.h > @@ -254,6 +254,7 @@ > #define PLANE_COLOR_PIPE_CSC_ENABLE REG_BIT(23) > /* Pre-ICL */ > #define PLANE_COLOR_PLANE_CSC_ENABLE REG_BIT(21) > /* ICL+ */ > #define PLANE_COLOR_INPUT_CSC_ENABLE REG_BIT(20) > /* ICL+ */ > +#define PLANE_COLOR_PRE_CSC_GAMMA_ENABLE REG_BIT(14) > #define PLANE_COLOR_CSC_MODE_MASK > REG_GENMASK(19, 17) > #define PLANE_COLOR_CSC_MODE_BYPASS > REG_FIELD_PREP(PLANE_COLOR_CSC_MODE_MASK, 0) > #define PLANE_COLOR_CSC_MODE_YUV601_TO_RGB601 > REG_FIELD_PREP(PLANE_COLOR_CSC_MODE_MASK, 1) > @@ -290,6 +291,53 @@ > > _PLANE_INPUT_CSC_POSTOFF_HI_1_A, _PLANE_INPUT_CSC_POSTOFF_HI_1_B, > \ > > _PLANE_INPUT_CSC_POSTOFF_HI_2_A, _PLANE_INPUT_CSC_POSTOFF_HI_2_B) > > +#define _MMIO_PLANE_GAMC(plane, i, a, b) _MMIO(_PIPE(plane, a, b) + (i) * > 4) > + > +#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_1_A 0x701d0 > +#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_1_B 0x711d0 > +#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_2_A 0x702d0 > +#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_2_B 0x712d0 > +#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_1(pipe) _PIPE(pipe, > _PLANE_PRE_CSC_GAMC_INDEX_ENH_1_A, \ > + > _PLANE_PRE_CSC_GAMC_INDEX_ENH_1_B) > +#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_2(pipe) _PIPE(pipe, > _PLANE_PRE_CSC_GAMC_INDEX_ENH_2_A, \ > + > _PLANE_PRE_CSC_GAMC_INDEX_ENH_2_B) > +#define PLANE_PRE_CSC_GAMC_INDEX_ENH(pipe, plane, i) > _MMIO_PLANE_GAMC(plane, i, > _PLANE_PRE_CSC_GAMC_INDEX_ENH_1(pipe), \ > + > _PLANE_PRE_CSC_GAMC_INDEX_ENH_2(pipe)) > +#define PLANE_PAL_PREC_AUTO_INCREMENT REG_BIT(10) > + > +#define _PLANE_PRE_CSC_GAMC_DATA_ENH_1_A 0x701d4 > +#define _PLANE_PRE_CSC_GAMC_DATA_ENH_1_B 0x711d4 > +#define _PLANE_PRE_CSC_GAMC_DATA_ENH_2_A 0x702d4 > +#define _PLANE_PRE_CSC_GAMC_DATA_ENH_2_B 0x712d4 > +#define _PLANE_PRE_CSC_GAMC_DATA_ENH_1(pipe) _PIPE(pipe, > _PLANE_PRE_CSC_GAMC_DATA_ENH_1_A, \ > + > _PLANE_PRE_CSC_GAMC_DATA_ENH_1_B) > +#define _PLANE_PRE_CSC_GAMC_DATA_ENH_2(pipe) _PIPE(pipe, > _PLANE_PRE_CSC_GAMC_DATA_ENH_2_A, \ > + > _PLANE_PRE_CSC_GAMC_DATA_ENH_2_B) > +#define PLANE_PRE_CSC_GAMC_DATA_ENH(pipe, plane, i) > _MMIO_PLANE_GAMC(plane, i, > _PLANE_PRE_CSC_GAMC_DATA_ENH_1(pipe), \ > + > _PLANE_PRE_CSC_GAMC_DATA_ENH_2(pipe)) > + > +#define _PLANE_PRE_CSC_GAMC_INDEX_1_A 0x704d0 > +#define _PLANE_PRE_CSC_GAMC_INDEX_1_B 0x714d0 > +#define _PLANE_PRE_CSC_GAMC_INDEX_2_A 0x705d0 > +#define _PLANE_PRE_CSC_GAMC_INDEX_2_B 0x715d0 > +#define _PLANE_PRE_CSC_GAMC_INDEX_1(pipe) _PIPE(pipe, > _PLANE_PRE_CSC_GAMC_INDEX_1_A, \ > + > _PLANE_PRE_CSC_GAMC_INDEX_1_B) > +#define _PLANE_PRE_CSC_GAMC_INDEX_2(pipe) _PIPE(pipe, > _PLANE_PRE_CSC_GAMC_INDEX_2_A, \ > + > _PLANE_PRE_CSC_GAMC_INDEX_2_B) > +#define PLANE_PRE_CSC_GAMC_INDEX(pipe, plane, i) > _MMIO_PLANE_GAMC(plane, i, > _PLANE_PRE_CSC_GAMC_INDEX_1(pipe), \ > + > _PLANE_PRE_CSC_GAMC_INDEX_2(pipe)) > + > +#define _PLANE_PRE_CSC_GAMC_DATA_1_A 0x704d4 > +#define _PLANE_PRE_CSC_GAMC_DATA_1_B 0x714d4 > +#define _PLANE_PRE_CSC_GAMC_DATA_2_A 0x705d4 > +#define _PLANE_PRE_CSC_GAMC_DATA_2_B 0x715d4 > +#define _PLANE_PRE_CSC_GAMC_DATA_1(pipe) _PIPE(pipe, > _PLANE_PRE_CSC_GAMC_DATA_1_A, \ > + > _PLANE_PRE_CSC_GAMC_DATA_1_B) > +#define _PLANE_PRE_CSC_GAMC_DATA_2(pipe) _PIPE(pipe, > _PLANE_PRE_CSC_GAMC_DATA_2_A, \ > + > _PLANE_PRE_CSC_GAMC_DATA_2_B) > +#define PLANE_PRE_CSC_GAMC_DATA(pipe, plane, i) > _MMIO_PLANE_GAMC(plane, i, > _PLANE_PRE_CSC_GAMC_DATA_1(pipe), \ > + > _PLANE_PRE_CSC_GAMC_DATA_2(pipe)) > + > #define _PLANE_CSC_RY_GY_1_A 0x70210 > #define _PLANE_CSC_RY_GY_2_A 0x70310 > #define _PLANE_CSC_RY_GY_1_B 0x71210 > -- > 2.50.1
