On Thu, Apr 25, 2013 at 04:14:23PM +0300, Imre Deak wrote: > On Fri, 2013-04-12 at 15:18 +0300, Jani Nikula wrote: > > Signed-off-by: Jani Nikula <jani.nikula at intel.com> > > --- > > drivers/gpu/drm/i915/intel_panel.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c > > index 5d3e9d7..0362f5c 100644 > > --- a/drivers/gpu/drm/i915/intel_panel.c > > +++ b/drivers/gpu/drm/i915/intel_panel.c > > @@ -344,6 +344,8 @@ void intel_panel_enable_backlight(struct drm_device *dev, > > enum pipe pipe) > > { > > struct drm_i915_private *dev_priv = dev->dev_private; > > + enum transcoder cpu_transcoder = > > + intel_pipe_to_cpu_transcoder(dev_priv, pipe); > > unsigned long flags; > > > > spin_lock_irqsave(&dev_priv->backlight.lock, flags); > > @@ -374,7 +376,7 @@ void intel_panel_enable_backlight(struct drm_device *dev, > > else > > tmp &= ~BLM_PIPE_SELECT; > > > > - tmp |= BLM_PIPE(pipe); > > + tmp |= BLM_PIPE(cpu_transcoder); > > Imo BLM_PIPE would be clearer checking for TRANSCODER_EDP explicitly, > but the code works anyway, so: > Reviewed-by: Imre Deak <imre.deak at intel.com> Atm all the difference between pipe and cpu_transcoder is about transcoder edp. So this feels explicit enough for me. Queued for -next, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch