From patchwork Wed Jan  6 01:02:24 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Peter Clifton <pcjc2@cam.ac.uk>
X-Patchwork-Id: 71209
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 o0612Wfl027569
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Wed, 6 Jan 2010 01:02:32 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 028999F00B;
	Tue,  5 Jan 2010 17:02:31 -0800 (PST)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from ppsw-5.csi.cam.ac.uk (ppsw-5.csi.cam.ac.uk [131.111.8.135])
	by gabe.freedesktop.org (Postfix) with ESMTP id 41B1F9F006
	for <intel-gfx@lists.freedesktop.org>;
	Tue,  5 Jan 2010 17:02:28 -0800 (PST)
X-Cam-AntiVirus: no malware found
X-Cam-SpamDetails: not scanned
X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/
Received: from cpc1-cmbg11-0-0-cust151.cmbg.cable.ntl.com
	([86.22.72.152]:42782 helo=[192.168.1.4])
	by ppsw-5.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.155]:465)
	with esmtpsa (LOGIN:pcjc2) (SSLv3:DHE-RSA-AES256-SHA:256)
	id 1NSKI5-0006al-H6 (Exim 4.70)
	(return-path <pcjc2@cam.ac.uk>); Wed, 06 Jan 2010 01:02:25 +0000
From: Peter Clifton <pcjc2@cam.ac.uk>
To: ykzhao <yakui.zhao@intel.com>, Zhenyu Wang <zhenyu.z.wang@intel.com>,
	Jesse Barnes <jbarnes@virtuousgeek.org>
In-Reply-To: <1262659722.4633.144.camel@localhost.localdomain>
References: <1262657854.3012.24.camel@pcjc2lap>
	<1262659722.4633.144.camel@localhost.localdomain>
Date: Wed, 06 Jan 2010 01:02:24 +0000
Message-ID: <1262739744.3115.12.camel@pcjc2lap>
Mime-Version: 1.0
X-Mailer: Evolution 2.28.2 
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>
Subject: Re: [Intel-gfx] TV detect
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.9
Precedence: list
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>
Sender: intel-gfx-bounces@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org


diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 1d5b9b7..ee92335 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1391,8 +1391,8 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_
        tv_dac &= ~DAC_A_MASK;
        tv_dac &= ~DAC_B_MASK;
        tv_dac &= ~DAC_C_MASK;
-       tv_dac |= (TVDAC_STATE_CHG_EN |
-                  TVDAC_A_SENSE_CTL |
+       tv_dac &= ~TVDAC_STATE_CHG_EN;
+       tv_dac |= (TVDAC_A_SENSE_CTL |
                   TVDAC_B_SENSE_CTL |
                   TVDAC_C_SENSE_CTL |
                   DAC_CTL_OVERRIDE |