diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-07 23:39:28 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-20 13:36:50 -0700 |
commit | 7e8ceff067f0482ee15a7b0b944f958a00a3fac3 (patch) | |
tree | 534c06d17aa9aa9d1b0758201f44f3ee732781f1 | |
parent | d9a9ffcc0d6d47bb0bdea19fc8e37577da3ee8bb (diff) | |
download | lwn-7e8ceff067f0482ee15a7b0b944f958a00a3fac3.tar.gz lwn-7e8ceff067f0482ee15a7b0b944f958a00a3fac3.zip |
Revert "drm/i915: Allow LVDS on pipe A on gen4+"
commit 12e8ba25ef52f19e7a42e61aecb3c1fef83b2a82 upstream.
This reverts commit 0f3ee801b332d6ff22285386675fe5aaedf035c3.
Enabling LVDS on pipe A was causing excessive wakeups on otherwise idle
systems due to i915 interrupts. So restrict the LVDS to pipe B once more,
whilst the issue is properly diagnosed.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16307
Reported-and-tested-by: Enrico Bandiello <enban@postal.uv.es>
Poked-by: Florian Mickler <florian@mickler.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Adam Jackson <ajax@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 0eab8df5bf7e..7d42ff16c4f6 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -988,8 +988,6 @@ void intel_lvds_init(struct drm_device *dev) intel_encoder->clone_mask = (1 << INTEL_LVDS_CLONE_BIT); intel_encoder->crtc_mask = (1 << 1); - if (IS_I965G(dev)) - intel_encoder->crtc_mask |= (1 << 0); drm_encoder_helper_add(encoder, &intel_lvds_helper_funcs); drm_connector_helper_add(connector, &intel_lvds_connector_helper_funcs); connector->display_info.subpixel_order = SubPixelHorizontalRGB; |