Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a37b9b34 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent dcdaed6e

drivers/gpu/drm/i915/dvo_ns2501.c

+0 −7
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -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;