diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a7c727d0c105..a8538ac0299d 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) | |||
| 6921 | POSTING_READ(vga_reg); | 6921 | POSTING_READ(vga_reg); |
| 6922 | } | 6922 | } |
| 6923 | 6923 | ||
| 6924 | static void ivb_pch_pwm_override(struct drm_device *dev) | ||
| 6925 | { | ||
| 6926 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
| 6927 | |||
| 6928 | /* | ||
| 6929 | * IVB has CPU eDP backlight regs too, set things up to let the | ||
| 6930 | * PCH regs control the backlight | ||
| 6931 | */ | ||
| 6932 | I915_WRITE(BLC_PWM_CPU_CTL2, PWM_ENABLE); | ||
| 6933 | I915_WRITE(BLC_PWM_CPU_CTL, 0); | ||
| 6934 | I915_WRITE(BLC_PWM_PCH_CTL1, PWM_ENABLE | (1<<30)); | ||
| 6935 | } | ||
| 6936 | |||
| 6937 | void intel_modeset_init_hw(struct drm_device *dev) | 6924 | void intel_modeset_init_hw(struct drm_device *dev) |
| 6938 | { | 6925 | { |
| 6939 | struct drm_i915_private *dev_priv = dev->dev_private; | 6926 | struct drm_i915_private *dev_priv = dev->dev_private; |
| @@ -6950,9 +6937,6 @@ void intel_modeset_init_hw(struct drm_device *dev) | |||
| 6950 | gen6_enable_rps(dev_priv); | 6937 | gen6_enable_rps(dev_priv); |
| 6951 | gen6_update_ring_freq(dev_priv); | 6938 | gen6_update_ring_freq(dev_priv); |
| 6952 | } | 6939 | } |
| 6953 | |||
| 6954 | if (IS_IVYBRIDGE(dev)) | ||
| 6955 | ivb_pch_pwm_override(dev); | ||
| 6956 | } | 6940 | } |
| 6957 | 6941 | ||
| 6958 | void intel_modeset_init(struct drm_device *dev) | 6942 | void intel_modeset_init(struct drm_device *dev) |
