On Thu, Feb 14, 2019 at 09:22:16PM +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > The "pipe" and "pf" crc sources are in fact the same thing. > Remove the "pf" one. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> I wonder where this came from.... Anyway, just by looking the current code: Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_drv.h | 1 - > drivers/gpu/drm/i915/intel_pipe_crc.c | 6 ++---- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 17fe942eaafa..4e11d970cbcf 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1196,7 +1196,6 @@ enum intel_pipe_crc_source { > INTEL_PIPE_CRC_SOURCE_NONE, > INTEL_PIPE_CRC_SOURCE_PLANE1, > INTEL_PIPE_CRC_SOURCE_PLANE2, > - INTEL_PIPE_CRC_SOURCE_PF, > INTEL_PIPE_CRC_SOURCE_PIPE, > /* TV/DP on pre-gen5/vlv can't use the pipe source. */ > INTEL_PIPE_CRC_SOURCE_TV, > diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c > index a8554dc4f196..a3a3ad760158 100644 > --- a/drivers/gpu/drm/i915/intel_pipe_crc.c > +++ b/drivers/gpu/drm/i915/intel_pipe_crc.c > @@ -34,7 +34,6 @@ static const char * const pipe_crc_sources[] = { > "none", > "plane1", > "plane2", > - "pf", > "pipe", > "TV", > "DP-B", > @@ -396,7 +395,7 @@ static int ivb_pipe_crc_ctl_reg(struct drm_i915_private *dev_priv, > bool set_wa) > { > if (*source == INTEL_PIPE_CRC_SOURCE_AUTO) > - *source = INTEL_PIPE_CRC_SOURCE_PF; > + *source = INTEL_PIPE_CRC_SOURCE_PIPE; > > switch (*source) { > case INTEL_PIPE_CRC_SOURCE_PLANE1: > @@ -405,7 +404,7 @@ static int ivb_pipe_crc_ctl_reg(struct drm_i915_private *dev_priv, > case INTEL_PIPE_CRC_SOURCE_PLANE2: > *val = PIPE_CRC_ENABLE | PIPE_CRC_SOURCE_SPRITE_IVB; > break; > - case INTEL_PIPE_CRC_SOURCE_PF: > + case INTEL_PIPE_CRC_SOURCE_PIPE: > if (set_wa && (IS_HASWELL(dev_priv) || > IS_BROADWELL(dev_priv)) && pipe == PIPE_A) > hsw_pipe_A_crc_wa(dev_priv, true); > @@ -532,7 +531,6 @@ static int ivb_crc_source_valid(struct drm_i915_private *dev_priv, > case INTEL_PIPE_CRC_SOURCE_PIPE: > case INTEL_PIPE_CRC_SOURCE_PLANE1: > case INTEL_PIPE_CRC_SOURCE_PLANE2: > - case INTEL_PIPE_CRC_SOURCE_PF: > case INTEL_PIPE_CRC_SOURCE_NONE: > return 0; > default: > -- > 2.19.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx