From patchwork Sat Apr 30 10:27:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 743192 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3UB7BjA006268 for ; Sat, 30 Apr 2011 11:07:40 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B82D19E95A for ; Sat, 30 Apr 2011 03:27:34 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mx1.suse.de (cantor.suse.de [195.135.220.2]) by gabe.freedesktop.org (Postfix) with ESMTP id 9110F9E85C for ; Sat, 30 Apr 2011 03:27:26 -0700 (PDT) Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 102B08E8CC; Sat, 30 Apr 2011 12:27:25 +0200 (CEST) Date: Sat, 30 Apr 2011 12:27:24 +0200 Message-ID: From: Takashi Iwai To: Melchior FRANZ Subject: Re: i915/kms/backlight-combo mode problem (was: Re: Linux 2.6.39-rc5) In-Reply-To: <201104301032.05271@rk-nord.at> References: <201104292209.55154@rk-nord.at> <201104301032.05271@rk-nord.at> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Cc: Linus Torvalds , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 30 Apr 2011 11:08:05 +0000 (UTC) At Sat, 30 Apr 2011 10:32:04 +0200, Melchior FRANZ wrote: > > * Takashi Iwai -- Saturday 30 April 2011: > > I remember vaguely that the value zero could be interpreted as the max. > > > Also, with the patch, does the backlight level can be adjusted > > correctly to different values? I wonder whether LBPC adjustment > > really works or not on your machine. > > > + if (!lbpc) > > + lbpc = 0xff; /* max value */ > > This change does *not* work on my machine. The screen stays black > again. Hrm, then it's really hard to say how exactly the system behaves when lbpc=0... I guess we should avoid controlling LBPC in such a case, e.g. something like the patch below (totally untested). But Intel guys must know of this better... I leave this to their hands. > > Yes, backlight adjustment generally works on this notebook, but only > with "acpi_osi=Linux" on the command line. acpi_osi quirk should be better added statically, then. thanks, Takashi diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 1c1b27c..c0ab771 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -328,6 +328,7 @@ typedef struct drm_i915_private { struct intel_overlay *overlay; /* LVDS info */ + int backlight_combination_mode; /* 0=unknown, -1=no, 1=yes */ int backlight_level; /* restore backlight to this value */ bool backlight_enabled; struct drm_display_mode *panel_fixed_mode; diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index a06ff07..320dd5f 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -115,14 +115,24 @@ done: static int is_backlight_combination_mode(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - - if (INTEL_INFO(dev)->gen >= 4) - return I915_READ(BLC_PWM_CTL2) & BLM_COMBINATION_MODE; - - if (IS_GEN2(dev)) - return I915_READ(BLC_PWM_CTL) & BLM_LEGACY_MODE; - - return 0; + int combo_mode; + u8 lbpc; + + if (dev_priv->backlight_combination_mode) + return dev_priv->backlight_combination_mode > 0; + + pci_read_config_byte(dev->pdev, PCI_LBPC, &lbpc); + if (!lbpc) + combo_mode = 0; + else if (INTEL_INFO(dev)->gen >= 4) + combo_mode = I915_READ(BLC_PWM_CTL2) & BLM_COMBINATION_MODE; + else if (IS_GEN2(dev)) + combo_mode = I915_READ(BLC_PWM_CTL) & BLM_LEGACY_MODE; + else + combo_mode = 0; + + dev_priv->backlight_combination_mode = combo_mode ? -1 : 1; + return combo_mode; } static u32 i915_read_blc_pwm_ctl(struct drm_i915_private *dev_priv)