On 10/29/2015 12:25 PM, ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > No point in doing the crtc->pipe->crtc->config->cpu_transcoder dance > when we can just do crtc->config->cpu_transcoder. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_display.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index bc1907e..d3cd177 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -2106,8 +2106,7 @@ static void intel_enable_pipe(struct intel_crtc *crtc) > struct drm_device *dev = crtc->base.dev; > struct drm_i915_private *dev_priv = dev->dev_private; > enum pipe pipe = crtc->pipe; > - enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, > - pipe); > + enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; > enum pipe pch_transcoder; > int reg; > u32 val; > @@ -5208,13 +5207,11 @@ static unsigned long get_crtc_power_domains(struct drm_crtc *crtc) > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > enum pipe pipe = intel_crtc->pipe; > unsigned long mask; > - enum transcoder transcoder; > + enum transcoder transcoder = intel_crtc->config->cpu_transcoder; > > if (!crtc->state->active) > return 0; > > - transcoder = intel_pipe_to_cpu_transcoder(dev->dev_private, pipe); > - > mask = BIT(POWER_DOMAIN_PIPE(pipe)); > mask |= BIT(POWER_DOMAIN_TRANSCODER(transcoder)); > if (intel_crtc->config->pch_pfit.enabled || > Reviewed-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
