[Intel-gfx] [PATCH] drm/i915: Move CUR_SURFLIFE definition to a better place.

[Rodrigo Vivi]

On Mon, Mar 12, 2018 at 10:35:30PM +0200, Ville Syrjälä wrote:
> On Mon, Mar 12, 2018 at 01:27:03PM -0700, Rodrigo Vivi wrote:
> > No functional change. But let's keep definitions clean
> > and cursor related register definitions together.
> > 
> > Suggested-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_reg.h | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index abdc513a9edd..561bf0fda746 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -6009,6 +6009,7 @@ enum {
> >  #define CURSIZE			_MMIO(0x700a0) /* 845/865 */
> >  #define _CUR_FBC_CTL_A		0x700a0 /* ivb+ */
> >  #define   CUR_FBC_CTL_EN	(1 << 31)
> > +#define _CUR_SURLIVE		0x700aC /* g4x+ */
> 
> To caps or not to caps? (referring to the aC part)
> 
> Name should be _CURASURFLIVE to match the original name
> of the register for pipe A. And I suppose the parametrized version
> shouldn't have the '_' either then.
> 
> With that
> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

changed, ci'ed and pushed. Thanks for suggestions and review.

> 
> >  #define _CURBCNTR		0x700c0
> >  #define _CURBBASE		0x700c4
> >  #define _CURBPOS		0x700c8
> > @@ -6025,6 +6026,7 @@ enum {
> >  #define CURBASE(pipe) _CURSOR2(pipe, _CURABASE)
> >  #define CURPOS(pipe) _CURSOR2(pipe, _CURAPOS)
> >  #define CUR_FBC_CTL(pipe) _CURSOR2(pipe, _CUR_FBC_CTL_A)
> > +#define CUR_SURLIVE(pipe) _CURSOR2(pipe, _CUR_SURLIVE)
> >  
> >  #define CURSOR_A_OFFSET 0x70080
> >  #define CURSOR_B_OFFSET 0x700c0
> > @@ -6032,9 +6034,6 @@ enum {
> >  #define IVB_CURSOR_B_OFFSET 0x71080
> >  #define IVB_CURSOR_C_OFFSET 0x72080
> >  
> > -#define _CUR_SURLIVE		0x700AC
> > -#define CUR_SURLIVE(pipe)	_CURSOR2(pipe, _CUR_SURLIVE)
> > -
> >  /* Display A control */
> >  #define _DSPACNTR				0x70180
> >  #define   DISPLAY_PLANE_ENABLE			(1<<31)
> > -- 
> > 2.13.6
> 
> -- 
> Ville Syrjälä
> Intel OTC