| Message ID | 20211201152552.7821-6-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Plane register cleanup | expand |
On Wed, 2021-12-01 at 17:25 +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Rename the PLANE_CUS_CTL Y plane selection bits to actually > say "Y plane". > Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 8 ++++---- > drivers/gpu/drm/i915/i915_reg.h | 8 ++++---- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index badf035efaeb..726c1552c9bf 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -5159,13 +5159,13 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state) > > if (icl_is_hdr_plane(dev_priv, plane->id)) { > if (linked->id == PLANE_SPRITE5) > - plane_state->cus_ctl |= PLANE_CUS_PLANE_7; > + plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_7_ICL; > else if (linked->id == PLANE_SPRITE4) > - plane_state->cus_ctl |= PLANE_CUS_PLANE_6; > + plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_6_ICL; > else if (linked->id == PLANE_SPRITE3) > - plane_state->cus_ctl |= PLANE_CUS_PLANE_5_RKL; > + plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_5_RKL; > else if (linked->id == PLANE_SPRITE2) > - plane_state->cus_ctl |= PLANE_CUS_PLANE_4_RKL; > + plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_4_RKL; > else > MISSING_CASE(linked->id); > } > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 6066b1e2763c..4b2bc17d0235 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -7328,10 +7328,10 @@ enum { > #define _PLANE_CUS_CTL_1_A 0x701c8 > #define _PLANE_CUS_CTL_2_A 0x702c8 > #define PLANE_CUS_ENABLE (1 << 31) > -#define PLANE_CUS_PLANE_4_RKL (0 << 30) > -#define PLANE_CUS_PLANE_5_RKL (1 << 30) > -#define PLANE_CUS_PLANE_6 (0 << 30) > -#define PLANE_CUS_PLANE_7 (1 << 30) > +#define PLANE_CUS_Y_PLANE_4_RKL (0 << 30) > +#define PLANE_CUS_Y_PLANE_5_RKL (1 << 30) > +#define PLANE_CUS_Y_PLANE_6_ICL (0 << 30) > +#define PLANE_CUS_Y_PLANE_7_ICL (1 << 30) > #define PLANE_CUS_HPHASE_SIGN_NEGATIVE (1 << 19) > #define PLANE_CUS_HPHASE_0 (0 << 16) > #define PLANE_CUS_HPHASE_0_25 (1 << 16)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index badf035efaeb..726c1552c9bf 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5159,13 +5159,13 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state) if (icl_is_hdr_plane(dev_priv, plane->id)) { if (linked->id == PLANE_SPRITE5) - plane_state->cus_ctl |= PLANE_CUS_PLANE_7; + plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_7_ICL; else if (linked->id == PLANE_SPRITE4) - plane_state->cus_ctl |= PLANE_CUS_PLANE_6; + plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_6_ICL; else if (linked->id == PLANE_SPRITE3) - plane_state->cus_ctl |= PLANE_CUS_PLANE_5_RKL; + plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_5_RKL; else if (linked->id == PLANE_SPRITE2) - plane_state->cus_ctl |= PLANE_CUS_PLANE_4_RKL; + plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_4_RKL; else MISSING_CASE(linked->id); } diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 6066b1e2763c..4b2bc17d0235 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -7328,10 +7328,10 @@ enum { #define _PLANE_CUS_CTL_1_A 0x701c8 #define _PLANE_CUS_CTL_2_A 0x702c8 #define PLANE_CUS_ENABLE (1 << 31) -#define PLANE_CUS_PLANE_4_RKL (0 << 30) -#define PLANE_CUS_PLANE_5_RKL (1 << 30) -#define PLANE_CUS_PLANE_6 (0 << 30) -#define PLANE_CUS_PLANE_7 (1 << 30) +#define PLANE_CUS_Y_PLANE_4_RKL (0 << 30) +#define PLANE_CUS_Y_PLANE_5_RKL (1 << 30) +#define PLANE_CUS_Y_PLANE_6_ICL (0 << 30) +#define PLANE_CUS_Y_PLANE_7_ICL (1 << 30) #define PLANE_CUS_HPHASE_SIGN_NEGATIVE (1 << 19) #define PLANE_CUS_HPHASE_0 (0 << 16) #define PLANE_CUS_HPHASE_0_25 (1 << 16)