[Intel-gfx] [PATCH] Revert "drm/i915: allow PCH PWM override on IVB"

[Daniel Vetter]

On Wed, Jun 27, 2012 at 04:43:36PM +0200, Daniel Vetter wrote:
> This reverts commit f82cfb6bcda164ef3a66b8c3fc549b1f9bdd09ad.
> 
> This breaks the backlight controls on my IVB asus zenbook with an eDP
> panel.
> 
> I guess the right fix would be to read this bit and use either the pch
> or the cpu register to frob the backlight values. But that is stuff
> for -next.
> 
> Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
> Signed-Off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Jesse acked this on irc, so I've queued this one for -fixes.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_display.c |   16 ----------------
>  1 file changed, 16 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index a7c727d..a8538ac 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6921,19 +6921,6 @@ static void i915_disable_vga(struct drm_device *dev)
>  	POSTING_READ(vga_reg);
>  }
>  
> -static void ivb_pch_pwm_override(struct drm_device *dev)
> -{
> -	struct drm_i915_private *dev_priv = dev->dev_private;
> -
> -	/*
> -	 * IVB has CPU eDP backlight regs too, set things up to let the
> -	 * PCH regs control the backlight
> -	 */
> -	I915_WRITE(BLC_PWM_CPU_CTL2, PWM_ENABLE);
> -	I915_WRITE(BLC_PWM_CPU_CTL, 0);
> -	I915_WRITE(BLC_PWM_PCH_CTL1, PWM_ENABLE | (1<<30));
> -}
> -
>  void intel_modeset_init_hw(struct drm_device *dev)
>  {
>  	struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -6950,9 +6937,6 @@ void intel_modeset_init_hw(struct drm_device *dev)
>  		gen6_enable_rps(dev_priv);
>  		gen6_update_ring_freq(dev_priv);
>  	}
> -
> -	if (IS_IVYBRIDGE(dev))
> -		ivb_pch_pwm_override(dev);
>  }
>  
>  void intel_modeset_init(struct drm_device *dev)
> -- 
> 1.7.10.2
> 

-- 
Daniel Vetter
Mail: daniel at ffwll.ch
Mobile: +41 (0)79 365 57 48