From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Clifton Subject: Reverted commit - why? Date: Mon, 10 May 2010 21:00:46 +0100 Message-ID: <1273521646.2527.3.camel@pcjc2lap> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from ppsw-33.csi.cam.ac.uk (ppsw-33.csi.cam.ac.uk [131.111.8.133]) by gabe.freedesktop.org (Postfix) with ESMTP id ACC639EBD3 for ; Mon, 10 May 2010 13:00:49 -0700 (PDT) Received: from cpc1-cmbg11-0-0-cust151.cmbg.cable.ntl.com ([86.22.72.152]:59737 helo=[192.168.1.4]) by ppsw-33.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.159]:465) with esmtpsa (LOGIN:pcjc2) (SSLv3:DHE-RSA-AES256-SHA:256) id 1OBZ9j-0008Mk-Cg (Exim 4.70) for intel-gfx@lists.freedesktop.org (return-path ); Mon, 10 May 2010 21:00:48 +0100 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: "intel-gfx@lists.freedesktop.org" List-Id: intel-gfx@lists.freedesktop.org Just wondering what was bad about the patch reverted by this commit? Revert "drm/i915: Configure the TV sense state correctly on GM45 to make TV detection reliable" Eric mentioned on irc this patch was bad, so revert it. This reverts commit fb8b5a39b6310379d7b54c0c7113703a8eaf4a57. Acked-by: Eric Anholt Signed-off-by: Dave Airlie ----------------------- drivers/gpu/drm/i915/intel_tv.c ----------------------- index 081cb90..6d553c2 100644 @@ -1263,15 +1263,6 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_encoder *intel_encoder DAC_A_0_7_V | DAC_B_0_7_V | DAC_C_0_7_V); - - /* - * The TV sense state should be cleared to zero on cantiga platform. Otherwise - * the TV is misdetected. This is hardware requirement. - */ - if (IS_GM45(dev)) - tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL | - TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL); - I915_WRITE(TV_CTL, tv_ctl); I915_WRITE(TV_DAC, tv_dac); intel_wait_for_vblank(dev); Log for the patch was: drm/i915: Configure the TV sense state correctly on GM45 to make TV detection reliable The TV detection logic is not reliable on the Cantiga platform. Sometimes the TV will be misdetected as the following two cases: - TV is misdetected on some laptops. e.g. There is no TV connector port or no TV is attached. But the TV is shown as connected. - TV connector type is misdetected. e.g. the component TV is attached, but the TV is shown as S-video type. According to the hardware requirement, the TV sense state bits of TV DAC register should be cleared to zero on Cantiga platfrom. https://bugzilla.kernel.org/show_bug.cgi?id=14792 Cc: Stable Team Signed-off-by: Zhao Yakui Tested-by: Santi Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt Just wondering, since this fix prevented spurious mis-detection of connected TV-out on my GM45 laptop. -- Peter Clifton Electrical Engineering Division, Engineering Department, University of Cambridge, 9, JJ Thomson Avenue, Cambridge CB3 0FA Tel: +44 (0)7729 980173 - (No signal in the lab!) Tel: +44 (0)1223 748328 - (Shared lab phone, ask for me)