From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753384AbeAQOCz (ORCPT + 1 other); Wed, 17 Jan 2018 09:02:55 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:41720 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752778AbeAQOCK (ORCPT ); Wed, 17 Jan 2018 09:02:10 -0500 X-Google-Smtp-Source: ACJfBottjCYopurWJdjwO4b9suwIHEwCHJCrn0b3c0n1DGZbyOC3k1NKzx/tNP7w+dkGptZ5bAY64w== From: Daniel Vetter To: DRI Development Cc: LKML , Daniel Vetter , Lee Jones , Daniel Thompson , Jingoo Han , Thomas Petazzoni , Daniel Vetter Subject: [PATCH 4/6] staging/fbtft: Stop using BL_CORE_DRIVER1 Date: Wed, 17 Jan 2018 15:01:57 +0100 Message-Id: <20180117140159.27611-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180117140159.27611-1-daniel.vetter@ffwll.ch> References: <20180117140159.27611-1-daniel.vetter@ffwll.ch> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Leaking driver internal tracking into the already massively confusing backlight power tracking is really confusing. Luckily we have already a drvdata structure, so fixing this is really easy. Cc: Lee Jones Cc: Daniel Thompson Cc: Jingoo Han Cc: Thomas Petazzoni Signed-off-by: Daniel Vetter --- drivers/staging/fbtft/fbtft-core.c | 4 ++-- drivers/staging/fbtft/fbtft.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index 6d0363deba61..448929cc7ba1 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -255,7 +255,7 @@ static int fbtft_request_gpios_dt(struct fbtft_par *par) static int fbtft_backlight_update_status(struct backlight_device *bd) { struct fbtft_par *par = bl_get_data(bd); - bool polarity = !!(bd->props.state & BL_CORE_DRIVER1); + bool polarity = par->polarity; fbtft_par_dbg(DEBUG_BACKLIGHT, par, "%s: polarity=%d, power=%d, fb_blank=%d\n", @@ -305,7 +305,7 @@ void fbtft_register_backlight(struct fbtft_par *par) /* Assume backlight is off, get polarity from current state of pin */ bl_props.power = FB_BLANK_POWERDOWN; if (!gpio_get_value(par->gpio.led[0])) - bl_props.state |= BL_CORE_DRIVER1; + par->polarity = true; bd = backlight_device_register(dev_driver_string(par->info->device), par->info->device, par, diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h index 488ab788138e..54de7cdfdff7 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -240,6 +240,7 @@ struct fbtft_par { ktime_t update_time; bool bgr; void *extra; + bool polarity; }; #define NUMARGS(...) (sizeof((int[]){__VA_ARGS__})/sizeof(int)) -- 2.15.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 4/6] staging/fbtft: Stop using BL_CORE_DRIVER1 Date: Wed, 17 Jan 2018 15:01:57 +0100 Message-ID: <20180117140159.27611-4-daniel.vetter@ffwll.ch> References: <20180117140159.27611-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id A832A6E471 for ; Wed, 17 Jan 2018 14:02:10 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id b141so15545827wme.1 for ; Wed, 17 Jan 2018 06:02:10 -0800 (PST) In-Reply-To: <20180117140159.27611-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: DRI Development Cc: Thomas Petazzoni , Daniel Thompson , Daniel Vetter , LKML , Jingoo Han , Daniel Vetter , Lee Jones List-Id: dri-devel@lists.freedesktop.org TGVha2luZyBkcml2ZXIgaW50ZXJuYWwgdHJhY2tpbmcgaW50byB0aGUgYWxyZWFkeSBtYXNzaXZl bHkgY29uZnVzaW5nCmJhY2tsaWdodCBwb3dlciB0cmFja2luZyBpcyByZWFsbHkgY29uZnVzaW5n LgoKTHVja2lseSB3ZSBoYXZlIGFscmVhZHkgYSBkcnZkYXRhIHN0cnVjdHVyZSwgc28gZml4aW5n IHRoaXMgaXMgcmVhbGx5CmVhc3kuCgpDYzogTGVlIEpvbmVzIDxsZWUuam9uZXNAbGluYXJvLm9y Zz4KQ2M6IERhbmllbCBUaG9tcHNvbiA8ZGFuaWVsLnRob21wc29uQGxpbmFyby5vcmc+CkNjOiBK aW5nb28gSGFuIDxqaW5nb29oYW4xQGdtYWlsLmNvbT4KQ2M6IFRob21hcyBQZXRhenpvbmkgPHRo b21hcy5wZXRhenpvbmlAZnJlZS1lbGVjdHJvbnMuY29tPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwg VmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL3N0YWdpbmcvZmJ0 ZnQvZmJ0ZnQtY29yZS5jIHwgNCArKy0tCiBkcml2ZXJzL3N0YWdpbmcvZmJ0ZnQvZmJ0ZnQuaCAg ICAgIHwgMSArCiAyIGZpbGVzIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvZmJ0ZnQvZmJ0ZnQtY29yZS5jIGIvZHJp dmVycy9zdGFnaW5nL2ZidGZ0L2ZidGZ0LWNvcmUuYwppbmRleCA2ZDAzNjNkZWJhNjEuLjQ0ODky OWNjN2JhMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2ZidGZ0L2ZidGZ0LWNvcmUuYwor KysgYi9kcml2ZXJzL3N0YWdpbmcvZmJ0ZnQvZmJ0ZnQtY29yZS5jCkBAIC0yNTUsNyArMjU1LDcg QEAgc3RhdGljIGludCBmYnRmdF9yZXF1ZXN0X2dwaW9zX2R0KHN0cnVjdCBmYnRmdF9wYXIgKnBh cikKIHN0YXRpYyBpbnQgZmJ0ZnRfYmFja2xpZ2h0X3VwZGF0ZV9zdGF0dXMoc3RydWN0IGJhY2ts aWdodF9kZXZpY2UgKmJkKQogewogCXN0cnVjdCBmYnRmdF9wYXIgKnBhciA9IGJsX2dldF9kYXRh KGJkKTsKLQlib29sIHBvbGFyaXR5ID0gISEoYmQtPnByb3BzLnN0YXRlICYgQkxfQ09SRV9EUklW RVIxKTsKKwlib29sIHBvbGFyaXR5ID0gcGFyLT5wb2xhcml0eTsKIAogCWZidGZ0X3Bhcl9kYmco REVCVUdfQkFDS0xJR0hULCBwYXIsCiAJCSIlczogcG9sYXJpdHk9JWQsIHBvd2VyPSVkLCBmYl9i bGFuaz0lZFxuIiwKQEAgLTMwNSw3ICszMDUsNyBAQCB2b2lkIGZidGZ0X3JlZ2lzdGVyX2JhY2ts aWdodChzdHJ1Y3QgZmJ0ZnRfcGFyICpwYXIpCiAJLyogQXNzdW1lIGJhY2tsaWdodCBpcyBvZmYs IGdldCBwb2xhcml0eSBmcm9tIGN1cnJlbnQgc3RhdGUgb2YgcGluICovCiAJYmxfcHJvcHMucG93 ZXIgPSBGQl9CTEFOS19QT1dFUkRPV047CiAJaWYgKCFncGlvX2dldF92YWx1ZShwYXItPmdwaW8u bGVkWzBdKSkKLQkJYmxfcHJvcHMuc3RhdGUgfD0gQkxfQ09SRV9EUklWRVIxOworCQlwYXItPnBv bGFyaXR5ID0gdHJ1ZTsKIAogCWJkID0gYmFja2xpZ2h0X2RldmljZV9yZWdpc3RlcihkZXZfZHJp dmVyX3N0cmluZyhwYXItPmluZm8tPmRldmljZSksCiAJCQkJICAgICAgIHBhci0+aW5mby0+ZGV2 aWNlLCBwYXIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvZmJ0ZnQvZmJ0ZnQuaCBiL2Ry aXZlcnMvc3RhZ2luZy9mYnRmdC9mYnRmdC5oCmluZGV4IDQ4OGFiNzg4MTM4ZS4uNTRkZTdjZGZk ZmY3IDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvZmJ0ZnQvZmJ0ZnQuaAorKysgYi9kcml2 ZXJzL3N0YWdpbmcvZmJ0ZnQvZmJ0ZnQuaApAQCAtMjQwLDYgKzI0MCw3IEBAIHN0cnVjdCBmYnRm dF9wYXIgewogCWt0aW1lX3QgdXBkYXRlX3RpbWU7CiAJYm9vbCBiZ3I7CiAJdm9pZCAqZXh0cmE7 CisJYm9vbCBwb2xhcml0eTsKIH07CiAKICNkZWZpbmUgTlVNQVJHUyguLi4pICAoc2l6ZW9mKChp bnRbXSl7X19WQV9BUkdTX199KS9zaXplb2YoaW50KSkKLS0gCjIuMTUuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==