From 72b5b38e2045f1c2aaa77bc65f9847afe3d5cd2d Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Wed, 31 Oct 2012 18:12:53 -0200 Subject: [PATCH] --- yaml --- r: 345255 b: refs/heads/master c: fd9c0188981f1aca14f0fedb74df8b00b79a91c1 h: refs/heads/master i: 345253: 1fb32ad06f38411052004d4a2d0326c0dcfd1966 345251: 2be268fcb79b9b56bfc33889af9956283e2c7ad6 345247: 7921171a16694c1d56dca07b18727fc1a3b197a4 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c05cbb4c8ec0..363fd8574cce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 223a6fdfbf7e26d9ad5ee54e258eb164412fcbc0 +refs/heads/master: fd9c0188981f1aca14f0fedb74df8b00b79a91c1 diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 7509e7903c22..d50c3ff60bdd 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -3639,7 +3639,6 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) if (is_pch_port) { ironlake_fdi_disable(crtc); lpt_disable_pch_transcoder(dev_priv, cpu_transcoder); - intel_disable_pch_pll(intel_crtc); ironlake_fdi_pll_disable(intel_crtc); }