From patchwork Fri May 21 13:41:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chase Douglas X-Patchwork-Id: 53156 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 6C614B7D45 for ; Fri, 21 May 2010 23:41:27 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFSTZ-0007Sd-GJ; Fri, 21 May 2010 14:41:21 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFSTV-0007RW-Rs for kernel-team@lists.ubuntu.com; Fri, 21 May 2010 14:41:17 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OFSTU-0006Q6-BS for ; Fri, 21 May 2010 14:41:16 +0100 Received: from cpe-75-180-27-10.columbus.res.rr.com ([75.180.27.10] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1OFSTU-0002nn-1D for kernel-team@lists.ubuntu.com; Fri, 21 May 2010 14:41:16 +0100 From: Chase Douglas To: kernel-team@lists.ubuntu.com Subject: [MAVERICK][PATCH] Revert "UBUNTU: SAUCE: drm/i915: don't change DRM configuration when releasing load detect pipe" Date: Fri, 21 May 2010 09:41:13 -0400 Message-Id: <1274449273-20505-1-git-send-email-chase.douglas@canonical.com> X-Mailer: git-send-email 1.7.0.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 --- drivers/gpu/drm/i915/intel_display.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) 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 */