From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: v3.14-rc7: Backlight control broken on Dell XPS13 Date: Mon, 17 Mar 2014 18:41:48 +0200 Message-ID: <87vbvcrd4j.fsf@intel.com> References: <87eh213q70.fsf@kima.orebokech.com> <877g7s53ac.fsf@kima.orebokech.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C8426EAA1 for ; Mon, 17 Mar 2014 09:42:45 -0700 (PDT) In-Reply-To: <877g7s53ac.fsf@kima.orebokech.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Romain Francoise , Daniel Vetter Cc: intel-gfx List-Id: intel-gfx@lists.freedesktop.org On Mon, 17 Mar 2014, Romain Francoise wrote: > Hi Daniel, > > Daniel Vetter writes: > >> Please never just send a mail to maintainers, always cc mailing lists. > > Yes, sorry, I sent this privately because it wasn't a fully-formed bug > report; I just wanted Jani to confirm that it wasn't intentionally > broken as of -rc7. > >> Have you tested with the patch reverted to confirm that it's indeed >> this commit and not something else (e.g. in the acpi code)? > > I hadn't, but I've now reverted the revert and things work again as in > v3.13. So as far as I can tell the quirk is still definitely needed. Here's two patches to try, separately, *without* the quirk: Patch #1: diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index cb058408c70e..ef26115dbe68 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -659,7 +659,7 @@ static void pch_enable_backlight(struct intel_connector *connector) /* This won't stick until the above enable. */ intel_panel_actually_set_backlight(connector, panel->backlight.level); - pch_ctl2 = panel->backlight.max << 16; + pch_ctl2 = panel->backlight.max << 16 | panel->backlight.level; I915_WRITE(BLC_PWM_PCH_CTL2, pch_ctl2); pch_ctl1 = 0; Patch #2: diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index cb058408c70e..10849104fa1e 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -669,6 +669,8 @@ static void pch_enable_backlight(struct intel_connector *connector) I915_WRITE(BLC_PWM_PCH_CTL1, pch_ctl1); POSTING_READ(BLC_PWM_PCH_CTL1); I915_WRITE(BLC_PWM_PCH_CTL1, pch_ctl1 | BLM_PCH_PWM_ENABLE); + + intel_panel_actually_set_backlight(connector, panel->backlight.level); } static void i9xx_enable_backlight(struct intel_connector *connector) -- Jani Nikula, Intel Open Source Technology Center