[MAVERICK] Revert "UBUNTU: SAUCE: drm/i915: don't change DRM configuration when releasing load detect pipe"

Submitted by Chase Douglas on May 21, 2010, 1:41 p.m.

Details

Message ID 1274449273-20505-1-git-send-email-chase.douglas@canonical.com
State Accepted
Delegated to: Leann Ogasawara
Headers show

Commit Message

Chase Douglas May 21, 2010, 1:41 p.m.
This reverts commit 7e432ba9aae503aae4cbb7a7ed4d53e457c651e4.

This patch was originally applied for Lucid to fix some lid open/close
backlight issues. Upstream did not pull this in because they thought
there was a better solution.

I am not sure what the upstream solution is, but I had someone affected
by the bug test out the 2.6.34 mainline build. They could not reproduce
the issue, so we should revert this change to be in line with upstream.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
---
 drivers/gpu/drm/i915/intel_display.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Comments

Leann Ogasawara May 21, 2010, 3:35 p.m.
Having had confirmation from an affected user that this patch is no
longer necessary with the latest 2.6.34 kernel, I'm happy to drop this
especially it being a SAUCE patch.

Applied to Maverick master.

Thanks,
Leann

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 139de44..c7502b6 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3758,6 +3758,7 @@  struct drm_crtc *intel_get_load_detect_pipe(struct intel_encoder *intel_encoder,
 void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, int dpms_mode)
 {
 	struct drm_encoder *encoder = &intel_encoder->enc;
+	struct drm_device *dev = encoder->dev;
 	struct drm_crtc *crtc = encoder->crtc;
 	struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
 	struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
@@ -3767,6 +3768,7 @@  void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, int dpm
 		intel_encoder->base.encoder = NULL;
 		intel_encoder->load_detect_temp = false;
 		crtc->enabled = drm_helper_crtc_in_use(crtc);
+		drm_helper_disable_unused_functions(dev);
 	}
 
 	/* Switch crtc and encoder back off if necessary */