From patchwork Thu Jul 19 22:51:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carsten Emde X-Patchwork-Id: 1218911 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id E543E3FD48 for ; Thu, 19 Jul 2012 23:03:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BDA30A1043 for ; Thu, 19 Jul 2012 16:03:19 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from toro.web-alm.net (toro.web-alm.net [62.245.132.31]) by gabe.freedesktop.org (Postfix) with ESMTP id BC5C5A1025 for ; Thu, 19 Jul 2012 16:02:06 -0700 (PDT) Received: from toro.web-alm.net (localhost.localdomain [127.0.0.1]) by toro.web-alm.net (8.12.11.20060308/8.12.11/Web-Alm-2003112001) with ESMTP id q6JN24vg012744; Fri, 20 Jul 2012 01:02:04 +0200 Received: from rack3slot8.osadl.org (uucp@localhost) by toro.web-alm.net (8.12.11.20060308/8.12.10/Submit/Web-Alm-2003112001) with bsmtp id q6JN24dd012742; Fri, 20 Jul 2012 01:02:04 +0200 Received: from rack3slot1.osadl.org (rack3slot8.osadl.org [127.0.0.1]) by rack3slot8.osadl.org (8.13.8/8.13.8/CE-2010120801) with ESMTP id q6JMpfuS004918; Fri, 20 Jul 2012 00:51:41 +0200 Message-ID: <50088F7D.1020008@osadl.org> Date: Fri, 20 Jul 2012 00:51:41 +0200 From: Carsten Emde Organization: Open Source Automation Development Lab (OSADL) User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.24) Gecko/20111108 Fedora/3.1.16-1.fc14 Thunderbird/3.1.16 MIME-Version: 1.0 To: Daniel Vetter References: <20120426170844.GG5156@phenom.ffwll.local> <1335461132-11664-1-git-send-email-daniel.vetter@ffwll.ch> <4F999E10.2060404@osadl.org> <20120426193004.GJ5156@phenom.ffwll.local> <4F9AFF00.8010705@osadl.org> <20120602230800.GB4737@phenom.ffwll.local> <50081313.8070206@osadl.org> In-Reply-To: X-Virus-Scanned: ClamAV version 0.94.2, clamav-milter version 0.94.2 on rack3slot8.osadl.org X-Virus-Status: Clean X-Spam-Status: No, score=-101.0 required=5.0 tests=ALL_TRUSTED, T_RP_MATCHES_RCVD, USER_IN_WHITELIST autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on rack3slot8.osadl.org Cc: Intel Graphics Development Subject: Re: [Intel-gfx] [PATCH] properly enable the blc controller on the right pipe X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org On 07/19/2012 04:40 PM, Daniel Vetter wrote: > On Thu, Jul 19, 2012 at 4:00 PM, Carsten Emde wrote: >> On 06/11/2012 10:51 AM, Daniel Vetter wrote: >>> I've updated my backlight-confusion branch with new patches for gen4 >>> (it doesn't seem to work for these machines yet). Can you please test >>> the updated branch? >> >> I have added an additional test rack (#6) to our QA farm (osadl.org/QA) and >> populated this rack solely with notebooks that are equipped with Intel >> graphics board: >> >> Slot #1: Lenovo T61/7661W4G, Intel GMA X3100 >> Slot #2: IBM T601951-A47, Intel GMA 950 >> Slot #4: Acer Homa/Extensa 5230E-901G16N, Intel GMA 4500MHD >> Slot #5: Acer Morar/TravelMate 2410, Intel GMA 900 >> Slot #6: Dell Inspirion 1300/0RJ272, Intel GMA 900 >> Slot #7: Acer Aspire 5734Z, Intel GMA 4500M >> >> With the exception of slot #4 that runs a 3.2-based kernel, all other >> notebooks run a 3.4-based kernel. The notebook in Slot #7 is the one with >> the backlight headache. Unfortunately :-; no other notebook had any >> backlight problem when running a vanilla kernel, even the two new Acers are >> behaving well. >> >> In the meantime, however, I have received a report that the Acer 5732Z has >> the same problem. I am sure that the reporter will be willing to help with >> testing. Looks like the backlight problem is very specific to Acer Aspire >> 573xZ. But I agree that a generic solution always is better than a quirk. >> >> I've checked out the backlight-confusion branch of your git tree and tested >> it with and without the Acer quirk. I can report that the backlight works >> correctly with either version. I will now contact the owner of the Acer >> Aspire 5732Z and ask him to test the backlight-confusion branch without the >> Acer quirk on his notebook as well. >> >> Do you wish me to do any other test? > > Well, the backlight-confusion branch had a bug and outright disabled > the intel backlight :( drm-intel-next-queued should have fixes for all > the backlight goofus I've accidentally created, so testing feedback on > that branch would be highly appreciated. This branch is now broken again. The original drm-intel-next-queued branch works well (it still has the quirk), but after I reverted the Acer quirk, the screen remains dark. I double-checked it and used exactly the same patch to revert the quirk in the two trees: The backlight-confusion branch works, and the drm-intel-next-queued branch does not. I then used drivers/gpu/drm/i915/intel_panel.c from backlight-confusion in drm-intel-next-queued and - it worked again. When testing the two differences separately it turned out this patch did the magic: Hope this helps, -Carsten. Index: drm-intel/drivers/gpu/drm/i915/intel_panel.c =================================================================== --- drm-intel.orig/drivers/gpu/drm/i915/intel_panel.c +++ drm-intel/drivers/gpu/drm/i915/intel_panel.c @@ -121,6 +121,8 @@ static int is_backlight_combination_mode { struct drm_i915_private *dev_priv = dev->dev_private; + return 0; + if (INTEL_INFO(dev)->gen >= 4) return I915_READ(BLC_PWM_CTL2) & BLM_COMBINATION_MODE; Finally, only the first condition is obviously harmful - this patch also works well: Index: drm-intel/drivers/gpu/drm/i915/intel_panel.c =================================================================== --- drm-intel.orig/drivers/gpu/drm/i915/intel_panel.c +++ drm-intel/drivers/gpu/drm/i915/intel_panel.c @@ -121,8 +121,10 @@ static int is_backlight_combination_mode { struct drm_i915_private *dev_priv = dev->dev_private; +#if 0 if (INTEL_INFO(dev)->gen >= 4) return I915_READ(BLC_PWM_CTL2) & BLM_COMBINATION_MODE; +#endif if (IS_GEN2(dev)) return I915_READ(BLC_PWM_CTL) & BLM_LEGACY_MODE;