From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: fix inconsistent brightness after resume Date: Mon, 12 Jan 2015 12:31:09 +0200 Message-ID: <877fwsxpci.fsf@intel.com> References: <87fvbkz7nd.fsf@intel.com> <1420925135-1589-1-git-send-email-jmmahler@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1420925135-1589-1-git-send-email-jmmahler@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Jeremiah Mahler List-Id: dri-devel@lists.freedesktop.org T24gU2F0LCAxMCBKYW4gMjAxNSwgSmVyZW1pYWggTWFobGVyIDxqbW1haGxlckBnbWFpbC5jb20+ IHdyb3RlOgo+IENvbW1pdCA2ZGRhNzMwZTU1ZjQgaW50cm9kdWNlZCBhIGJ1ZyB3aGljaCByZXN1 bHRlZCBpbiBpbmNvbnNpc3RlbnQKPiBicmlnaHRuZXNzIGxldmVscyBvbiBkaWZmZXJlbnQgbWFj aGluZXMuIElmIGEgc3VzcGVuZGVkIHdhcyBlbnRlcmVkCj4gd2l0aCB0aGUgc2NyZWVuIG9mZiBz b21lIG1hY2hpbmVzIHdvdWxkIHJlc3VtZSB3aXRoIHRoZSBzY3JlZW4KPiBhdCBtaW5pbXVtIGJy aWdodG5lc3MgYW5kIG90aGVycyBhdCBtYXhpbXVtIGJyaWdodG5lc3MuCj4KPiBUaGUgZm9sbG93 aW5nIGNvbW1hbmRzIGNhbiBiZSB1c2VkIHRvIHByb2R1Y2UgdGhpcyBiZWhhdmlvci4KPgo+ICAg eHNldCBkcG1zIGZvcmNlIG9mZgo+ICAgc2xlZXAgMQo+ICAgc3VkbyBzeXN0ZW1jdGwgc3VzcGVu ZAo+ICAgKHJlc3VtZSAuLi4pCj4KPiBUaGUgcm9vdCBjYXVzZSBvZiB0aGlzIHByb2JsZW0gaXMg YSBjb21wYXJpc29uIHdoaWNoIGNoZWNrcyB0byBzZWUgaWYKPiB0aGUgYmFja2xpZ2h0IGxldmVs IGlzIHplcm8gd2hlbiB0aGUgcGFuZWwgaXMgZW5hYmxlZC4gIElmIGl0IGlzIHplcm8sCj4gaXQg aXMgc2V0IHRvIHRoZSBtYXhpbXVtIGxldmVsLiAgVW5mb3J0dW5hdGVseSwgbm90IGFsbCBtYWNo aW5lcyBoYXZlIGEKPiBtaW5pbXVtIGxldmVsIG9mIHplcm8uIE9uIHRob3NlIG1hY2hpbmVzIHRo ZSBsZXZlbCBpcyBsZWZ0IGF0IHRoZQo+IG1pbmltdW0gaW5zdGVhZCBvZiBiZWdpbiBzZXQgdG8g dGhlIG1heGltdW0uCgpHb29kIGNhdGNoIQoKSSB0aGluayBwYXJ0IG9mIHRoZSBwcm9ibGVtIGlz IHRoYXQgdGhlIHVzZXJzcGFjZSBzZXRzIGJyaWdodG5lc3MgdG8KbWluaW11bSBiZWZvcmUgc3Vz cGVuZCwgYnV0IGFwcGFyZW50bHkgZG9lcyBub3QgcmVzdG9yZSBpdCBhZnRlcgpyZXN1bWUuIFRo ZSBkbWVzZyB3b3VsZCBjb25maXJtIHRoaXMuIEJ1dCBJIGd1ZXNzIGl0IGRvZXNuJ3QgbWF0dGVy LApzaW5jZSB3ZSdyZSBwcmV0dHkgbXVjaCBzdHVjayB3aXRoIGhhdmluZyB0byBkbyB0aGlzIGFu eXdheS4KCj4gRml4IHRoZSBidWcgYnkgdXBkYXRpbmcgdGhlIGNvbXBhcmlzb24gdG8gY2hlY2sg Zm9yIHRoZSBtaW5pbXVtCj4gYmFja2xpZ2h0IGxldmVsIGluc3RlYWQgb2YgemVyby4KPgo+IEZp eGVzOiA2ZGRhNzMwZTU1ZjQgKCJyZXNwZWN0IHRoZSBWQlQgbWluaW11bSBiYWNrbGlnaHQgYnJp Z2h0bmVzcyIpCj4gU2lnbmVkLW9mZi1ieTogSmVyZW1pYWggTWFobGVyIDxqbW1haGxlckBnbWFp bC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BhbmVsLmMgfCAyICst Cj4gIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQo+Cj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BhbmVsLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wYW5lbC5jCj4gaW5kZXggNGQ2MzgzOS4uNGVmNGQ2NiAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wYW5lbC5jCj4gKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcGFuZWwuYwo+IEBAIC05NjIsNyArOTYyLDcgQEAgdm9pZCBp bnRlbF9wYW5lbF9lbmFibGVfYmFja2xpZ2h0KHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5l Y3RvcikKPiAgCj4gIAlXQVJOX09OKHBhbmVsLT5iYWNrbGlnaHQubWF4ID09IDApOwo+ICAKPiAt CWlmIChwYW5lbC0+YmFja2xpZ2h0LmxldmVsID09IDApIHsKPiArCWlmIChwYW5lbC0+YmFja2xp Z2h0LmxldmVsID09IHBhbmVsLT5iYWNrbGlnaHQubWluKSB7CgpQZXJoYXBzIDw9IGluc3RlYWQg b2YgPT0gd291bGQgYmUgc2FmZXN0PwoKCkJSLApKYW5pLgoKPiAgCQlwYW5lbC0+YmFja2xpZ2h0 LmxldmVsID0gcGFuZWwtPmJhY2tsaWdodC5tYXg7Cj4gIAkJaWYgKHBhbmVsLT5iYWNrbGlnaHQu ZGV2aWNlKQo+ICAJCQlwYW5lbC0+YmFja2xpZ2h0LmRldmljZS0+cHJvcHMuYnJpZ2h0bmVzcyA9 Cj4gLS0gCj4gMi4xLjQKPgoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNo bm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752844AbbALKad (ORCPT ); Mon, 12 Jan 2015 05:30:33 -0500 Received: from mga03.intel.com ([134.134.136.65]:14044 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752317AbbALKac (ORCPT ); Mon, 12 Jan 2015 05:30:32 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,743,1413270000"; d="scan'208";a="660423568" From: Jani Nikula To: Jeremiah Mahler Cc: Daniel Vetter , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jeremiah Mahler Subject: Re: [PATCH] drm/i915: fix inconsistent brightness after resume In-Reply-To: <1420925135-1589-1-git-send-email-jmmahler@gmail.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <87fvbkz7nd.fsf@intel.com> <1420925135-1589-1-git-send-email-jmmahler@gmail.com> User-Agent: Notmuch/0.19~rc1+1~g08b4944 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Mon, 12 Jan 2015 12:31:09 +0200 Message-ID: <877fwsxpci.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 10 Jan 2015, Jeremiah Mahler wrote: > Commit 6dda730e55f4 introduced a bug which resulted in inconsistent > brightness levels on different machines. If a suspended was entered > with the screen off some machines would resume with the screen > at minimum brightness and others at maximum brightness. > > The following commands can be used to produce this behavior. > > xset dpms force off > sleep 1 > sudo systemctl suspend > (resume ...) > > The root cause of this problem is a comparison which checks to see if > the backlight level is zero when the panel is enabled. If it is zero, > it is set to the maximum level. Unfortunately, not all machines have a > minimum level of zero. On those machines the level is left at the > minimum instead of begin set to the maximum. Good catch! I think part of the problem is that the userspace sets brightness to minimum before suspend, but apparently does not restore it after resume. The dmesg would confirm this. But I guess it doesn't matter, since we're pretty much stuck with having to do this anyway. > Fix the bug by updating the comparison to check for the minimum > backlight level instead of zero. > > Fixes: 6dda730e55f4 ("respect the VBT minimum backlight brightness") > Signed-off-by: Jeremiah Mahler > --- > drivers/gpu/drm/i915/intel_panel.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c > index 4d63839..4ef4d66 100644 > --- a/drivers/gpu/drm/i915/intel_panel.c > +++ b/drivers/gpu/drm/i915/intel_panel.c > @@ -962,7 +962,7 @@ void intel_panel_enable_backlight(struct intel_connector *connector) > > WARN_ON(panel->backlight.max == 0); > > - if (panel->backlight.level == 0) { > + if (panel->backlight.level == panel->backlight.min) { Perhaps <= instead of == would be safest? BR, Jani. > panel->backlight.level = panel->backlight.max; > if (panel->backlight.device) > panel->backlight.device->props.brightness = > -- > 2.1.4 > -- Jani Nikula, Intel Open Source Technology Center