[Intel-gfx] [PATCH v2 3/5] drm/i915: Introduce scaling filter related registers and bit fields.
Ville Syrjälä
ville.syrjala at linux.intel.com
Tue Mar 24 16:43:51 UTC 2020
On Tue, Mar 24, 2020 at 02:36:10PM +0000, Laxminarayan Bharadiya, Pankaj wrote:
>
>
> > -----Original Message-----
> > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > Sent: 23 March 2020 20:09
> > To: Laxminarayan Bharadiya, Pankaj
> > <pankaj.laxminarayan.bharadiya at intel.com>
> > Cc: Lattannavar, Sameer <sameer.lattannavar at intel.com>;
> > jani.nikula at linux.intel.com; daniel at ffwll.ch; intel-gfx at lists.freedesktop.org;
> > dri-devel at lists.freedesktop.org; daniels at collabora.com; Joonas Lahtinen
> > <joonas.lahtinen at linux.intel.com>; Vivi, Rodrigo <rodrigo.vivi at intel.com>;
> > David Airlie <airlied at linux.ie>
> > Subject: Re: [PATCH v2 3/5] drm/i915: Introduce scaling filter related registers
> > and bit fields.
> >
> > On Thu, Mar 19, 2020 at 03:51:01PM +0530, Pankaj Bharadiya wrote:
> > > Introduce scaler registers and bit fields needed to configure the
> > > scaling filter in prgrammed mode and configure scaling filter
> > > coefficients.
> > >
> > > changes since v1:
> > > * None
> > > changes since RFC:
> > > * Parametrize scaler coeffient macros by 'set' (Ville)
> > >
> > > Signed-off-by: Shashank Sharma <shashank.sharma at intel.com>
> > > Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>
> > > Signed-off-by: Pankaj Bharadiya
> > > <pankaj.laxminarayan.bharadiya at intel.com>
> > > ---
> > > drivers/gpu/drm/i915/i915_reg.h | 48
> > > +++++++++++++++++++++++++++++++++
> > > 1 file changed, 48 insertions(+)
> > >
> > > diff --git a/drivers/gpu/drm/i915/i915_reg.h
> > > b/drivers/gpu/drm/i915/i915_reg.h index 9c53fe918be6..d40f12d2a6b5
> > > 100644
> > > --- a/drivers/gpu/drm/i915/i915_reg.h
> > > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > > @@ -7205,6 +7205,7 @@ enum {
> > > #define PS_PLANE_SEL(plane) (((plane) + 1) << 25)
> > > #define PS_FILTER_MASK (3 << 23)
> > > #define PS_FILTER_MEDIUM (0 << 23)
> > > +#define PS_FILTER_PROGRAMMED (1 << 23)
> > > #define PS_FILTER_EDGE_ENHANCE (2 << 23)
> > > #define PS_FILTER_BILINEAR (3 << 23)
> > > #define PS_VERT3TAP (1 << 21)
> > > @@ -7219,6 +7220,10 @@ enum {
> > > #define PS_VADAPT_MODE_MOST_ADAPT (3 << 5) #define
> > > PS_PLANE_Y_SEL_MASK (7 << 5) #define PS_PLANE_Y_SEL(plane) (((plane)
> > > + 1) << 5)
> > > +#define PS_Y_VERT_FILTER_SELECT(set) ((set) << 4)
> > > +#define PS_Y_HORZ_FILTER_SELECT(set) ((set) << 3)
> > > +#define PS_UV_VERT_FILTER_SELECT(set) ((set) << 2) #define
> > > +PS_UV_HORZ_FILTER_SELECT(set) ((set) << 1)
> > >
> > > #define _PS_PWR_GATE_1A 0x68160
> > > #define _PS_PWR_GATE_2A 0x68260
> > > @@ -7281,6 +7286,25 @@ enum {
> > > #define _PS_ECC_STAT_2B 0x68AD0
> > > #define _PS_ECC_STAT_1C 0x691D0
> > >
> > > +#define _PS_COEF_SET0_INDEX_1A 0x68198
> > > +#define _PS_COEF_SET0_INDEX_2A 0x68298
> > > +#define _PS_COEF_SET0_INDEX_1B 0x68998
> > > +#define _PS_COEF_SET0_INDEX_2B 0x68A98
> > > +#define _PS_COEF_SET1_INDEX_1A 0x681A0
> > > +#define _PS_COEF_SET1_INDEX_2A 0x682A0
> > > +#define _PS_COEF_SET1_INDEX_1B 0x689A0
> > > +#define _PS_COEF_SET1_INDEX_2B 0x68AA0
> > > +#define PS_COEE_INDEX_AUTO_INC (1 << 10)
> > > +
> > > +#define _PS_COEF_SET0_DATA_1A 0x6819C
> > > +#define _PS_COEF_SET0_DATA_2A 0x6829C
> > > +#define _PS_COEF_SET0_DATA_1B 0x6899C
> > > +#define _PS_COEF_SET0_DATA_2B 0x68A9C
> > > +#define _PS_COEF_SET1_DATA_1A 0x681A4
> > > +#define _PS_COEF_SET1_DATA_2A 0x682A4
> > > +#define _PS_COEF_SET1_DATA_1B 0x689A4
> > > +#define _PS_COEF_SET1_DATA_2B 0x68AA4
> > > +
> > > #define _ID(id, a, b) _PICK_EVEN(id, a, b)
> > > #define SKL_PS_CTRL(pipe, id) _MMIO_PIPE(pipe, \
> > > _ID(id, _PS_1A_CTRL, _PS_2A_CTRL), \
> > > @@ -7310,6 +7334,30 @@ enum {
> > > _ID(id, _PS_ECC_STAT_1A, _PS_ECC_STAT_2A), \
> > > _ID(id, _PS_ECC_STAT_1B, _PS_ECC_STAT_2B))
> > >
> > > +#define _SKL_PS_COEF_INDEX_SET0(pipe, id) _ID(pipe, \
> > > + _ID(id, _PS_COEF_SET0_INDEX_1A,
> > _PS_COEF_SET0_INDEX_2A), \
> > > + _ID(id, _PS_COEF_SET0_INDEX_1B,
> > _PS_COEF_SET0_INDEX_2B))
> > > +
> > > +#define _SKL_PS_COEF_INDEX_SET1(pipe, id) _ID(pipe, \
> > > + _ID(id, _PS_COEF_SET1_INDEX_1A,
> > _PS_COEF_SET1_INDEX_2A), \
> > > + _ID(id, _PS_COEF_SET1_INDEX_1B,
> > _PS_COEF_SET1_INDEX_2B))
> > > +
> > > +#define _SKL_PS_COEF_DATA_SET0(pipe, id) _ID(pipe, \
> > > + _ID(id, _PS_COEF_SET0_DATA_1A,
> > _PS_COEF_SET0_DATA_2A), \
> > > + _ID(id, _PS_COEF_SET0_DATA_1B,
> > _PS_COEF_SET0_DATA_2B))
> > > +
> > > +#define _SKL_PS_COEF_DATA_SET1(pipe, id) _ID(pipe, \
> > > + _ID(id, _PS_COEF_SET1_DATA_1A,
> > _PS_COEF_SET1_DATA_2A), \
> > > + _ID(id, _PS_COEF_SET1_DATA_1B,
> > _PS_COEF_SET1_DATA_2B))
> > > +
> > > +#define SKL_PS_COEF_INDEX_SET(pipe, id, set) \
> > > + _MMIO_PIPE(set, _SKL_PS_COEF_INDEX_SET0(pipe, id),
> > \
> > > + _SKL_PS_COEF_INDEX_SET1(pipe, id))
> > > +
> > > +#define SKL_PS_COEF_DATA_SET(pipe, id, set) \
> > > + _MMIO_PIPE(set, _SKL_PS_COEF_DATA_SET0(pipe, id),
> > \
> > > + _SKL_PS_COEF_DATA_SET1(pipe, id))
> >
> > I'd name those CNL_PS_COEF_{DATA,INDEX}(). Or maybe eeven GLK_ since it
> > already has this despite not being officially supported.
>
> All other existing scaler macros start will SKL_PS_*, adding new CNL_PS_* may
> lead to confusion IMO since we will end up in using mixed SKL_PS_* and CNL_PS_* name
> to configure scaler.
They are called SKL_ because skl is where they got introduced.
>
> >
> > Also I'd probably just have used +(set)*8 instead of adding another trip through
> > _PICK_EVEN(). It's getting a bit hard to read this.
>
> OK.
> How does this sound like? -
>
> +#define SKL_PS_COEF_INDEX_SET(pipe, id, set) _MMIO_PIPE(pipe, \
> + _ID(id, _PS_COEF_SET0_INDEX_1A, _PS_COEF_SET0_INDEX_2A) + (set) * 8, \
> + _ID(id, _PS_COEF_SET0_INDEX_1B, _PS_COEF_SET0_INDEX_2B) + (set) * 8)
>
> +#define SKL_PS_COEF_DATA_SET(pipe, id, set) _MMIO_PIPE(pipe, \
> + _ID(id, _PS_COEF_SET0_DATA_1A, _PS_COEF_SET0_DATA_2A) + (set) * 8, \
> + _ID(id, _PS_COEF_SET0_DATA_1B, _PS_COEF_SET0_DATA_2B) + (set) * 8)
Looks all right.
>
> Thanks,
> Pankaj
> >
> > > +
> > > /* legacy palette */
> > > #define _LGC_PALETTE_A 0x4a000
> > > #define _LGC_PALETTE_B 0x4a800
> > > --
> > > 2.23.0
> >
> > --
> > Ville Syrjälä
> > Intel
--
Ville Syrjälä
Intel
More information about the Intel-gfx
mailing list