From patchwork Sat Sep 19 06:54:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenyu Wang X-Patchwork-Id: 47830 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8G5sZW5019563 for ; Wed, 16 Sep 2009 05:54:35 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8459A9EB26; Tue, 15 Sep 2009 22:54:34 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fmsmga102.fm.intel.com (mga10.intel.com [192.55.52.92]) by gabe.freedesktop.org (Postfix) with ESMTP id 617F69EB0B for ; Tue, 15 Sep 2009 22:54:31 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 15 Sep 2009 22:42:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,395,1249282800"; d="scan'208";a="493895389" Received: from ubuntu-ilm.sh.intel.com (HELO localhost.localdomain) ([10.239.36.94]) by fmsmga002.fm.intel.com with ESMTP; 15 Sep 2009 22:46:43 -0700 From: Zhenyu Wang To: eric@anholt.net Date: Sat, 19 Sep 2009 14:54:08 +0800 Message-Id: <1253343249-12008-4-git-send-email-zhenyuw@linux.intel.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1253343249-12008-3-git-send-email-zhenyuw@linux.intel.com> References: <1253343249-12008-1-git-send-email-zhenyuw@linux.intel.com> <1253343249-12008-2-git-send-email-zhenyuw@linux.intel.com> <1253343249-12008-3-git-send-email-zhenyuw@linux.intel.com> Cc: intel-gfx@lists.freedesktop.org, Stable Team Subject: [Intel-gfx] [PATCH] drm/i915: Remove DAC disable in CRT force detect on IGDNG X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org This is not required on newer stepping hardware to get reliable force detect status. Removing this fixes screen blank flicker in CRT detect on IGDNG. Cc: Stable Team Signed-off-by: Zhenyu Wang --- drivers/gpu/drm/i915/intel_crt.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 88814fa..212e227 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -179,13 +179,10 @@ static bool intel_igdng_crt_detect_hotplug(struct drm_connector *connector) { struct drm_device *dev = connector->dev; struct drm_i915_private *dev_priv = dev->dev_private; - u32 adpa, temp; + u32 adpa; bool ret; - temp = adpa = I915_READ(PCH_ADPA); - - adpa &= ~ADPA_DAC_ENABLE; - I915_WRITE(PCH_ADPA, adpa); + adpa = I915_READ(PCH_ADPA); adpa &= ~ADPA_CRT_HOTPLUG_MASK; @@ -212,8 +209,6 @@ static bool intel_igdng_crt_detect_hotplug(struct drm_connector *connector) else ret = false; - /* restore origin register */ - I915_WRITE(PCH_ADPA, temp); return ret; }