Revert "drm/i915: allow PCH PWM override on IVB"
This reverts commit f82cfb6bcd
.
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@virtuousgeek.org>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
6db65cbb94
commit
7aa1e7f06d
|
@ -6921,19 +6921,6 @@ static void i915_disable_vga(struct drm_device *dev)
|
||||||
POSTING_READ(vga_reg);
|
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)
|
void intel_modeset_init_hw(struct drm_device *dev)
|
||||||
{
|
{
|
||||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
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_enable_rps(dev_priv);
|
||||||
gen6_update_ring_freq(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)
|
void intel_modeset_init(struct drm_device *dev)
|
||||||
|
|
Reference in New Issue