drm/i915/ns2501: kill pll A enabling hack

With the pipe A quirk properly fixed up for i830M, this shouldn't be
required any longer.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/dvo_ns2501.c b/drivers/gpu/drm/i915/dvo_ns2501.c
index 1a0bad9a5fab739c3a71f9b3ea52c3511e740abf..6bd383dfbb092c2143cad3c34e16c20a87bc3eee 100644 (file)
--- a/drivers/gpu/drm/i915/dvo_ns2501.c
+++ b/drivers/gpu/drm/i915/dvo_ns2501.c
@@ -74,11 +74,6 @@ struct ns2501_priv {
 
 #define NSPTR(d) ((NS2501Ptr)(d->DriverPrivate.ptr))
 
-/*
- * Include the PLL launcher prototype
- */
-extern void intel_enable_pll(struct drm_i915_private *dev_priv, enum pipe pipe);
-
 /*
  * For reasons unclear to me, the ns2501 at least on the Fujitsu/Siemens
  * laptops does not react on the i2c bus unless
@@ -113,8 +108,6 @@ static void enable_dvo(struct intel_dvo_device *dvo)
        I915_WRITE(DVOC_SRCDIM, 0x400300);      // 1024x768
        I915_WRITE(FW_BLC, 0x1080304);
 
-       intel_enable_pll(dev_priv, 0);
-
        I915_WRITE(DVOC, 0x90004084);
 }
 

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index dd760f43f5779904eedda68d0133c92b6104e232..a55f6642be200612f61465fa436c323ca61dc5af 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1432,7 +1432,7 @@ static void assert_pch_ports_disabled(struct drm_i915_private *dev_priv,
  *
  * Unfortunately needed by dvo_ns2501 since the dvo depends on it running.
  */
-void intel_enable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)
+static void intel_enable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)
 {
        int reg;
        u32 val;