From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Date: Thu, 25 Jul 2019 14:32:24 +0000 Subject: [PATCH v1 1/1] backlight: drop EARLY_EVENT_BLANK support Message-Id: <20190725143224.GB31803@ravnborg.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Lee Jones , Daniel Thompson , Bartlomiej Zolnierkiewicz Cc: linux-fbdev@vger.kernel.org, Jingoo Han , dri-devel@lists.freedesktop.org, =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , Gerd Hoffmann , Daniel Vetter , Sam Ravnborg , Peter Rosin There was no users left - so drop the code to support EARLY_FB_BLANK. This patch removes the support in backlight, and drop the notifier in fbmem. That EARLY_FB_BLANK is not used can be verified that no driver set any of: lcd_ops.early_set_power() lcd_ops.r_early_set_power() Noticed while browsing backlight code for other reasons. Signed-off-by: Sam Ravnborg Cc: Lee Jones Cc: Daniel Thompson Cc: Jingoo Han Cc: Bartlomiej Zolnierkiewicz Cc: Daniel Vetter Cc: Sam Ravnborg Cc: Maarten Lankhorst Cc: "Michał Mirosław" Cc: Peter Rosin Cc: Gerd Hoffmann Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org --- Build tested with various architectures, configs. Lee, Daniel - OK to commit to drm-misc-next where fbdev stuff is maintained today? Patch needs ack from Bartlomiej first of course. Sam drivers/video/backlight/lcd.c | 8 -------- drivers/video/fbdev/core/fbmem.c | 12 +----------- include/linux/fb.h | 4 ---- include/linux/lcd.h | 10 ---------- 4 files changed, 1 insertion(+), 33 deletions(-) diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c index d6b653aa4ee9..78b033358625 100644 --- a/drivers/video/backlight/lcd.c +++ b/drivers/video/backlight/lcd.c @@ -39,14 +39,6 @@ static int fb_notifier_callback(struct notifier_block *self, if (event = FB_EVENT_BLANK) { if (ld->ops->set_power) ld->ops->set_power(ld, *(int *)evdata->data); - } else if (event = FB_EARLY_EVENT_BLANK) { - if (ld->ops->early_set_power) - ld->ops->early_set_power(ld, - *(int *)evdata->data); - } else if (event = FB_R_EARLY_EVENT_BLANK) { - if (ld->ops->r_early_set_power) - ld->ops->r_early_set_power(ld, - *(int *)evdata->data); } else { if (ld->ops->set_mode) ld->ops->set_mode(ld, evdata->data); diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 00fe0efeaee9..e6a1c805064f 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1058,7 +1058,7 @@ int fb_blank(struct fb_info *info, int blank) { struct fb_event event; - int ret = -EINVAL, early_ret; + int ret = -EINVAL; if (blank > FB_BLANK_POWERDOWN) blank = FB_BLANK_POWERDOWN; @@ -1066,21 +1066,11 @@ fb_blank(struct fb_info *info, int blank) event.info = info; event.data = ␣ - early_ret = fb_notifier_call_chain(FB_EARLY_EVENT_BLANK, &event); - if (info->fbops->fb_blank) ret = info->fbops->fb_blank(blank, info); if (!ret) fb_notifier_call_chain(FB_EVENT_BLANK, &event); - else { - /* - * if fb_blank is failed then revert effects of - * the early blank event. - */ - if (!early_ret) - fb_notifier_call_chain(FB_R_EARLY_EVENT_BLANK, &event); - } return ret; } diff --git a/include/linux/fb.h b/include/linux/fb.h index 50948e519897..756706b666a1 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -135,10 +135,6 @@ struct fb_cursor_user { /* A display blank is requested */ #define FB_EVENT_BLANK 0x09 -/* A hardware display blank early change occurred */ -#define FB_EARLY_EVENT_BLANK 0x10 -/* A hardware display blank revert early change occurred */ -#define FB_R_EARLY_EVENT_BLANK 0x11 struct fb_event { struct fb_info *info; diff --git a/include/linux/lcd.h b/include/linux/lcd.h index 851eee8fff25..238fb1dfed98 100644 --- a/include/linux/lcd.h +++ b/include/linux/lcd.h @@ -41,16 +41,6 @@ struct lcd_ops { /* Get the LCD panel power status (0: full on, 1..3: controller power on, flat panel power off, 4: full off), see FB_BLANK_XXX */ int (*get_power)(struct lcd_device *); - /* - * Enable or disable power to the LCD(0: on; 4: off, see FB_BLANK_XXX) - * and this callback would be called proir to fb driver's callback. - * - * P.S. note that if early_set_power is not NULL then early fb notifier - * would be registered. - */ - int (*early_set_power)(struct lcd_device *, int power); - /* revert the effects of the early blank event. */ - int (*r_early_set_power)(struct lcd_device *, int power); /* Enable or disable power to the LCD (0: on; 4: off, see FB_BLANK_XXX) */ int (*set_power)(struct lcd_device *, int power); /* Get the current contrast setting (0-max_contrast) */ -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Subject: [PATCH v1 1/1] backlight: drop EARLY_EVENT_BLANK support Date: Thu, 25 Jul 2019 16:32:24 +0200 Message-ID: <20190725143224.GB31803@ravnborg.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from asavdk4.altibox.net (asavdk4.altibox.net [109.247.116.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id CF06E6E428 for ; Thu, 25 Jul 2019 14:32:28 +0000 (UTC) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Lee Jones , Daniel Thompson , Bartlomiej Zolnierkiewicz Cc: linux-fbdev@vger.kernel.org, Jingoo Han , dri-devel@lists.freedesktop.org, =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , Gerd Hoffmann , Daniel Vetter , Sam Ravnborg , Peter Rosin List-Id: dri-devel@lists.freedesktop.org VGhlcmUgd2FzIG5vIHVzZXJzIGxlZnQgLSBzbyBkcm9wIHRoZSBjb2RlIHRvIHN1cHBvcnQgRUFS TFlfRkJfQkxBTksuClRoaXMgcGF0Y2ggcmVtb3ZlcyB0aGUgc3VwcG9ydCBpbiBiYWNrbGlnaHQs CmFuZCBkcm9wIHRoZSBub3RpZmllciBpbiBmYm1lbS4KClRoYXQgRUFSTFlfRkJfQkxBTksgaXMg bm90IHVzZWQgY2FuIGJlIHZlcmlmaWVkIHRoYXQgbm8gZHJpdmVyIHNldCBhbnkgb2Y6CgogICAg bGNkX29wcy5lYXJseV9zZXRfcG93ZXIoKQogICAgbGNkX29wcy5yX2Vhcmx5X3NldF9wb3dlcigp CgpOb3RpY2VkIHdoaWxlIGJyb3dzaW5nIGJhY2tsaWdodCBjb2RlIGZvciBvdGhlciByZWFzb25z LgoKU2lnbmVkLW9mZi1ieTogU2FtIFJhdm5ib3JnIDxzYW1AcmF2bmJvcmcub3JnPgpDYzogTGVl IEpvbmVzIDxsZWUuam9uZXNAbGluYXJvLm9yZz4KQ2M6IERhbmllbCBUaG9tcHNvbiA8ZGFuaWVs LnRob21wc29uQGxpbmFyby5vcmc+CkNjOiBKaW5nb28gSGFuIDxqaW5nb29oYW4xQGdtYWlsLmNv bT4KQ2M6IEJhcnRsb21pZWogWm9sbmllcmtpZXdpY3ogPGIuem9sbmllcmtpZUBzYW1zdW5nLmNv bT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CkNjOiBTYW0gUmF2 bmJvcmcgPHNhbUByYXZuYm9yZy5vcmc+CkNjOiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5s YW5raG9yc3RAbGludXguaW50ZWwuY29tPgpDYzogIk1pY2hhxYIgTWlyb3PFgmF3IiA8bWlycS1s aW51eEByZXJlLnFtcW0ucGw+CkNjOiBQZXRlciBSb3NpbiA8cGVkYUBheGVudGlhLnNlPgpDYzog R2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+CkNjOiBkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCkNjOiBsaW51eC1mYmRldkB2Z2VyLmtlcm5lbC5vcmcKLS0tCgpCdWlsZCB0 ZXN0ZWQgd2l0aCB2YXJpb3VzIGFyY2hpdGVjdHVyZXMsIGNvbmZpZ3MuCgpMZWUsIERhbmllbCAt IE9LIHRvIGNvbW1pdCB0byBkcm0tbWlzYy1uZXh0IHdoZXJlIGZiZGV2IHN0dWZmIGlzCm1haW50 YWluZWQgdG9kYXk/CgpQYXRjaCBuZWVkcyBhY2sgZnJvbSBCYXJ0bG9taWVqIGZpcnN0IG9mIGNv dXJzZS4KCglTYW0KCiBkcml2ZXJzL3ZpZGVvL2JhY2tsaWdodC9sY2QuYyAgICB8ICA4IC0tLS0t LS0tCiBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJtZW0uYyB8IDEyICstLS0tLS0tLS0tLQog aW5jbHVkZS9saW51eC9mYi5oICAgICAgICAgICAgICAgfCAgNCAtLS0tCiBpbmNsdWRlL2xpbnV4 L2xjZC5oICAgICAgICAgICAgICB8IDEwIC0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMSBp bnNlcnRpb24oKyksIDMzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8v YmFja2xpZ2h0L2xjZC5jIGIvZHJpdmVycy92aWRlby9iYWNrbGlnaHQvbGNkLmMKaW5kZXggZDZi NjUzYWE0ZWU5Li43OGIwMzMzNTg2MjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdmlkZW8vYmFja2xp Z2h0L2xjZC5jCisrKyBiL2RyaXZlcnMvdmlkZW8vYmFja2xpZ2h0L2xjZC5jCkBAIC0zOSwxNCAr MzksNiBAQCBzdGF0aWMgaW50IGZiX25vdGlmaWVyX2NhbGxiYWNrKHN0cnVjdCBub3RpZmllcl9i bG9jayAqc2VsZiwKIAkJaWYgKGV2ZW50ID09IEZCX0VWRU5UX0JMQU5LKSB7CiAJCQlpZiAobGQt Pm9wcy0+c2V0X3Bvd2VyKQogCQkJCWxkLT5vcHMtPnNldF9wb3dlcihsZCwgKihpbnQgKilldmRh dGEtPmRhdGEpOwotCQl9IGVsc2UgaWYgKGV2ZW50ID09IEZCX0VBUkxZX0VWRU5UX0JMQU5LKSB7 Ci0JCQlpZiAobGQtPm9wcy0+ZWFybHlfc2V0X3Bvd2VyKQotCQkJCWxkLT5vcHMtPmVhcmx5X3Nl dF9wb3dlcihsZCwKLQkJCQkJCSooaW50ICopZXZkYXRhLT5kYXRhKTsKLQkJfSBlbHNlIGlmIChl dmVudCA9PSBGQl9SX0VBUkxZX0VWRU5UX0JMQU5LKSB7Ci0JCQlpZiAobGQtPm9wcy0+cl9lYXJs eV9zZXRfcG93ZXIpCi0JCQkJbGQtPm9wcy0+cl9lYXJseV9zZXRfcG93ZXIobGQsCi0JCQkJCQkq KGludCAqKWV2ZGF0YS0+ZGF0YSk7CiAJCX0gZWxzZSB7CiAJCQlpZiAobGQtPm9wcy0+c2V0X21v ZGUpCiAJCQkJbGQtPm9wcy0+c2V0X21vZGUobGQsIGV2ZGF0YS0+ZGF0YSk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJtZW0uYyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYv Y29yZS9mYm1lbS5jCmluZGV4IDAwZmUwZWZlYWVlOS4uZTZhMWM4MDUwNjRmIDEwMDY0NAotLS0g YS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJtZW0uYworKysgYi9kcml2ZXJzL3ZpZGVvL2Zi ZGV2L2NvcmUvZmJtZW0uYwpAQCAtMTA1OCw3ICsxMDU4LDcgQEAgaW50CiBmYl9ibGFuayhzdHJ1 Y3QgZmJfaW5mbyAqaW5mbywgaW50IGJsYW5rKQogewkKIAlzdHJ1Y3QgZmJfZXZlbnQgZXZlbnQ7 Ci0JaW50IHJldCA9IC1FSU5WQUwsIGVhcmx5X3JldDsKKwlpbnQgcmV0ID0gLUVJTlZBTDsKIAog IAlpZiAoYmxhbmsgPiBGQl9CTEFOS19QT1dFUkRPV04pCiAgCQlibGFuayA9IEZCX0JMQU5LX1BP V0VSRE9XTjsKQEAgLTEwNjYsMjEgKzEwNjYsMTEgQEAgZmJfYmxhbmsoc3RydWN0IGZiX2luZm8g KmluZm8sIGludCBibGFuaykKIAlldmVudC5pbmZvID0gaW5mbzsKIAlldmVudC5kYXRhID0gJmJs YW5rOwogCi0JZWFybHlfcmV0ID0gZmJfbm90aWZpZXJfY2FsbF9jaGFpbihGQl9FQVJMWV9FVkVO VF9CTEFOSywgJmV2ZW50KTsKLQogCWlmIChpbmZvLT5mYm9wcy0+ZmJfYmxhbmspCiAgCQlyZXQg PSBpbmZvLT5mYm9wcy0+ZmJfYmxhbmsoYmxhbmssIGluZm8pOwogCiAJaWYgKCFyZXQpCiAJCWZi X25vdGlmaWVyX2NhbGxfY2hhaW4oRkJfRVZFTlRfQkxBTkssICZldmVudCk7Ci0JZWxzZSB7Ci0J CS8qCi0JCSAqIGlmIGZiX2JsYW5rIGlzIGZhaWxlZCB0aGVuIHJldmVydCBlZmZlY3RzIG9mCi0J CSAqIHRoZSBlYXJseSBibGFuayBldmVudC4KLQkJICovCi0JCWlmICghZWFybHlfcmV0KQotCQkJ ZmJfbm90aWZpZXJfY2FsbF9jaGFpbihGQl9SX0VBUkxZX0VWRU5UX0JMQU5LLCAmZXZlbnQpOwot CX0KIAogIAlyZXR1cm4gcmV0OwogfQpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9mYi5oIGIv aW5jbHVkZS9saW51eC9mYi5oCmluZGV4IDUwOTQ4ZTUxOTg5Ny4uNzU2NzA2YjY2NmExIDEwMDY0 NAotLS0gYS9pbmNsdWRlL2xpbnV4L2ZiLmgKKysrIGIvaW5jbHVkZS9saW51eC9mYi5oCkBAIC0x MzUsMTAgKzEzNSw2IEBAIHN0cnVjdCBmYl9jdXJzb3JfdXNlciB7CiAKIC8qICAgICAgQSBkaXNw bGF5IGJsYW5rIGlzIHJlcXVlc3RlZCAgICAgICAqLwogI2RlZmluZSBGQl9FVkVOVF9CTEFOSyAg ICAgICAgICAgICAgICAgIDB4MDkKLS8qICAgICAgQSBoYXJkd2FyZSBkaXNwbGF5IGJsYW5rIGVh cmx5IGNoYW5nZSBvY2N1cnJlZCAqLwotI2RlZmluZSBGQl9FQVJMWV9FVkVOVF9CTEFOSwkJMHgx MAotLyogICAgICBBIGhhcmR3YXJlIGRpc3BsYXkgYmxhbmsgcmV2ZXJ0IGVhcmx5IGNoYW5nZSBv Y2N1cnJlZCAqLwotI2RlZmluZSBGQl9SX0VBUkxZX0VWRU5UX0JMQU5LCQkweDExCiAKIHN0cnVj dCBmYl9ldmVudCB7CiAJc3RydWN0IGZiX2luZm8gKmluZm87CmRpZmYgLS1naXQgYS9pbmNsdWRl L2xpbnV4L2xjZC5oIGIvaW5jbHVkZS9saW51eC9sY2QuaAppbmRleCA4NTFlZWU4ZmZmMjUuLjIz OGZiMWRmZWQ5OCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9sY2QuaAorKysgYi9pbmNsdWRl L2xpbnV4L2xjZC5oCkBAIC00MSwxNiArNDEsNiBAQCBzdHJ1Y3QgbGNkX29wcyB7CiAJLyogR2V0 IHRoZSBMQ0QgcGFuZWwgcG93ZXIgc3RhdHVzICgwOiBmdWxsIG9uLCAxLi4zOiBjb250cm9sbGVy CiAJICAgcG93ZXIgb24sIGZsYXQgcGFuZWwgcG93ZXIgb2ZmLCA0OiBmdWxsIG9mZiksIHNlZSBG Ql9CTEFOS19YWFggKi8KIAlpbnQgKCpnZXRfcG93ZXIpKHN0cnVjdCBsY2RfZGV2aWNlICopOwot CS8qCi0JICogRW5hYmxlIG9yIGRpc2FibGUgcG93ZXIgdG8gdGhlIExDRCgwOiBvbjsgNDogb2Zm LCBzZWUgRkJfQkxBTktfWFhYKQotCSAqIGFuZCB0aGlzIGNhbGxiYWNrIHdvdWxkIGJlIGNhbGxl ZCBwcm9pciB0byBmYiBkcml2ZXIncyBjYWxsYmFjay4KLQkgKgotCSAqIFAuUy4gbm90ZSB0aGF0 IGlmIGVhcmx5X3NldF9wb3dlciBpcyBub3QgTlVMTCB0aGVuIGVhcmx5IGZiIG5vdGlmaWVyCi0J ICoJd291bGQgYmUgcmVnaXN0ZXJlZC4KLQkgKi8KLQlpbnQgKCplYXJseV9zZXRfcG93ZXIpKHN0 cnVjdCBsY2RfZGV2aWNlICosIGludCBwb3dlcik7Ci0JLyogcmV2ZXJ0IHRoZSBlZmZlY3RzIG9m IHRoZSBlYXJseSBibGFuayBldmVudC4gKi8KLQlpbnQgKCpyX2Vhcmx5X3NldF9wb3dlcikoc3Ry dWN0IGxjZF9kZXZpY2UgKiwgaW50IHBvd2VyKTsKIAkvKiBFbmFibGUgb3IgZGlzYWJsZSBwb3dl ciB0byB0aGUgTENEICgwOiBvbjsgNDogb2ZmLCBzZWUgRkJfQkxBTktfWFhYKSAqLwogCWludCAo KnNldF9wb3dlcikoc3RydWN0IGxjZF9kZXZpY2UgKiwgaW50IHBvd2VyKTsKIAkvKiBHZXQgdGhl IGN1cnJlbnQgY29udHJhc3Qgc2V0dGluZyAoMC1tYXhfY29udHJhc3QpICovCi0tIAoyLjIwLjEK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==