On Fri, Jun 07, 2024 at 06:25:39PM +0300, Jani Nikula wrote: > Some plane B/C specific bits were left next to the unused _DSPBCNTR > macro. Move them next to the DSPCNTR() macro. Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/i9xx_plane_regs.h | 2 ++ > drivers/gpu/drm/i915/i915_reg.h | 2 -- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/i9xx_plane_regs.h b/drivers/gpu/drm/i915/display/i9xx_plane_regs.h > index a2ba55fa2b30..5d7ba824f354 100644 > --- a/drivers/gpu/drm/i915/display/i9xx_plane_regs.h > +++ b/drivers/gpu/drm/i915/display/i9xx_plane_regs.h > @@ -38,10 +38,12 @@ > #define DISP_STEREO_POLARITY_SECOND REG_BIT(18) > #define DISP_ALPHA_PREMULTIPLY REG_BIT(16) /* CHV pipe B */ > #define DISP_ROTATE_180 REG_BIT(15) /* i965+ */ > +#define DISP_ALPHA_TRANS_ENABLE REG_BIT(15) /* pre-g4x plane B */ > #define DISP_TRICKLE_FEED_DISABLE REG_BIT(14) /* g4x+ */ > #define DISP_TILED REG_BIT(10) /* i965+ */ > #define DISP_ASYNC_FLIP REG_BIT(9) /* g4x+ */ > #define DISP_MIRROR REG_BIT(8) /* CHV pipe B */ > +#define DISP_SPRITE_ABOVE_OVERLAY REG_BIT(0) /* pre-g4x plane B/C */ > > #define _DSPAADDR 0x70184 /* pre-i965 */ > #define DSPADDR(dev_priv, plane) _MMIO_PIPE2(dev_priv, plane, _DSPAADDR) > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 7daf902772e4..2a14dd9ef4a0 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -2226,8 +2226,6 @@ > > /* Display B control */ > #define _DSPBCNTR (DISPLAY_MMIO_BASE(dev_priv) + 0x71180) > -#define DISP_ALPHA_TRANS_ENABLE REG_BIT(15) > -#define DISP_SPRITE_ABOVE_OVERLAY REG_BIT(0) > #define _DSPBADDR (DISPLAY_MMIO_BASE(dev_priv) + 0x71184) > #define _DSPBSTRIDE (DISPLAY_MMIO_BASE(dev_priv) + 0x71188) > #define _DSPBPOS (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C) > -- > 2.39.2 >
