| Message ID | 20171010125556.25086-1-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 10, 2017 at 03:55:56PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > One more place where we've failed to switch to enum pipe when talking > about PCH transcoders. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/intel_display.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 45d6e57fbe89..57d886cece16 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -14758,10 +14758,10 @@ static struct intel_connector *intel_encoder_find_connector(struct intel_encoder > } > > static bool has_pch_trancoder(struct drm_i915_private *dev_priv, > - enum transcoder pch_transcoder) > + enum pipe pch_transcoder) > { > return HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv) || > - (HAS_PCH_LPT_H(dev_priv) && pch_transcoder == TRANSCODER_A); > + (HAS_PCH_LPT_H(dev_priv) && pch_transcoder == PIPE_A); > } > > static void intel_sanitize_crtc(struct intel_crtc *crtc, > @@ -14844,7 +14844,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, > * PCH transcoders B and C would prevent enabling the south > * error interrupt (see cpt_can_enable_serr_int()). > */ > - if (has_pch_trancoder(dev_priv, (enum transcoder)crtc->pipe)) > + if (has_pch_trancoder(dev_priv, crtc->pipe)) > crtc->pch_fifo_underrun_disabled = true; > } > } > -- > 2.13.6 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, Oct 10, 2017 at 04:00:42PM +0200, Daniel Vetter wrote: > On Tue, Oct 10, 2017 at 03:55:56PM +0300, Ville Syrjala wrote: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > One more place where we've failed to switch to enum pipe when talking > > about PCH transcoders. > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Pushed to dinq. Thanks for the review. > > > --- > > drivers/gpu/drm/i915/intel_display.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index 45d6e57fbe89..57d886cece16 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -14758,10 +14758,10 @@ static struct intel_connector *intel_encoder_find_connector(struct intel_encoder > > } > > > > static bool has_pch_trancoder(struct drm_i915_private *dev_priv, > > - enum transcoder pch_transcoder) > > + enum pipe pch_transcoder) > > { > > return HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv) || > > - (HAS_PCH_LPT_H(dev_priv) && pch_transcoder == TRANSCODER_A); > > + (HAS_PCH_LPT_H(dev_priv) && pch_transcoder == PIPE_A); > > } > > > > static void intel_sanitize_crtc(struct intel_crtc *crtc, > > @@ -14844,7 +14844,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, > > * PCH transcoders B and C would prevent enabling the south > > * error interrupt (see cpt_can_enable_serr_int()). > > */ > > - if (has_pch_trancoder(dev_priv, (enum transcoder)crtc->pipe)) > > + if (has_pch_trancoder(dev_priv, crtc->pipe)) > > crtc->pch_fifo_underrun_disabled = true; > > } > > } > > -- > > 2.13.6 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 45d6e57fbe89..57d886cece16 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -14758,10 +14758,10 @@ static struct intel_connector *intel_encoder_find_connector(struct intel_encoder } static bool has_pch_trancoder(struct drm_i915_private *dev_priv, - enum transcoder pch_transcoder) + enum pipe pch_transcoder) { return HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv) || - (HAS_PCH_LPT_H(dev_priv) && pch_transcoder == TRANSCODER_A); + (HAS_PCH_LPT_H(dev_priv) && pch_transcoder == PIPE_A); } static void intel_sanitize_crtc(struct intel_crtc *crtc, @@ -14844,7 +14844,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, * PCH transcoders B and C would prevent enabling the south * error interrupt (see cpt_can_enable_serr_int()). */ - if (has_pch_trancoder(dev_priv, (enum transcoder)crtc->pipe)) + if (has_pch_trancoder(dev_priv, crtc->pipe)) crtc->pch_fifo_underrun_disabled = true; } }