From patchwork Mon Jan 25 02:35:16 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Zhenyu Wang <zhenyuw@linux.intel.com>
X-Patchwork-Id: 75010
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0P2ZLm9006954
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Mon, 25 Jan 2010 02:35:21 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 2532E9E765;
	Sun, 24 Jan 2010 18:35:21 -0800 (PST)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
	by gabe.freedesktop.org (Postfix) with ESMTP id 3C8299E75D
	for <intel-gfx@lists.freedesktop.org>;
	Sun, 24 Jan 2010 18:35:18 -0800 (PST)
Received: from orsmga002.jf.intel.com ([10.7.209.21])
	by orsmga102.jf.intel.com with ESMTP; 24 Jan 2010 18:34:50 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.49,336,1262592000";
	d="asc'?scan'208";a="486620433"
Received: from zhen-devel.sh.intel.com (HELO zhen-devel) ([10.239.13.159])
	by orsmga002.jf.intel.com with ESMTP; 24 Jan 2010 18:35:09 -0800
Date: Mon, 25 Jan 2010 10:35:16 +0800
From: Zhenyu Wang <zhenyuw@linux.intel.com>
To: Eric Anholt <eric@anholt.net>
Message-ID: <20100125023516.GB18093@zhen-devel.sh.intel.com>
Mail-Followup-To: Eric Anholt <eric@anholt.net>,
	intel-gfx@lists.freedesktop.org, Stable Team <stable@kernel.org>
References: <1260324253-22738-1-git-send-email-zhenyuw@linux.intel.com>
	<87aaxs4n5o.fsf@pollan.anholt.net>
MIME-Version: 1.0
In-Reply-To: <87aaxs4n5o.fsf@pollan.anholt.net>
User-Agent: Mutt/1.5.20 (2009-06-14)
Cc: intel-gfx@lists.freedesktop.org, Stable Team <stable@kernel.org>
Subject: [Intel-gfx] [PATCH] drm/i915: disable hotplug detect before
	Ironlake CRT detect
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.9
Precedence: list
Reply-To: Zhenyu Wang <zhenyuw@linux.intel.com>
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Mime-version: 1.0
Sender: intel-gfx-bounces@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org


diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index ddefc87..79dd402 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -157,6 +157,9 @@ static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)
 	adpa = I915_READ(PCH_ADPA);
 
 	adpa &= ~ADPA_CRT_HOTPLUG_MASK;
+	/* disable HPD first */
+	I915_WRITE(PCH_ADPA, adpa);
+	(void)I915_READ(PCH_ADPA);
 
 	adpa |= (ADPA_CRT_HOTPLUG_PERIOD_128 |
 			ADPA_CRT_HOTPLUG_WARMUP_10MS |