From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D27C4C04AAF for ; Mon, 20 May 2019 17:20:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ADB79214AE for ; Mon, 20 May 2019 17:20:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392767AbfETRUP (ORCPT ); Mon, 20 May 2019 13:20:15 -0400 Received: from asavdk3.altibox.net ([109.247.116.14]:52065 "EHLO asavdk3.altibox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733069AbfETRUO (ORCPT ); Mon, 20 May 2019 13:20:14 -0400 Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk3.altibox.net (Postfix) with ESMTPS id 424FE2008D; Mon, 20 May 2019 19:20:10 +0200 (CEST) Date: Mon, 20 May 2019 19:20:08 +0200 From: Sam Ravnborg To: Daniel Vetter Cc: DRI Development , Bartlomiej Zolnierkiewicz , Intel Graphics Development , LKML , =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , Yisheng Xie , Hans de Goede , Mikulas Patocka , Daniel Vetter , Peter Rosin Subject: Re: [PATCH 27/33] fbdev: remove FBINFO_MISC_USEREVENT around fb_blank Message-ID: <20190520172008.GB27230@ravnborg.org> References: <20190520082216.26273-1-daniel.vetter@ffwll.ch> <20190520082216.26273-28-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190520082216.26273-28-daniel.vetter@ffwll.ch> User-Agent: Mutt/1.10.1 (2018-07-13) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=dqr19Wo4 c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=IkcTkHD0fZMA:10 a=QyXUC8HyAAAA:8 a=hD80L64hAAAA:8 a=20KFwNOVAAAA:8 a=bDN84i_9AAAA:8 a=pGLkceISAAAA:8 a=e5mUnYsNAAAA:8 a=MCcOG3vBCl0DkZwRRUMA:9 a=QEXdDO2ut3YA:10 a=J2PsDwZO0S0EpbpLmD-j:22 a=Vxmtnl_E_bksehYqCbjh:22 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Daniel. > With the recursion broken in the previous patch we can drop the > FBINFO_MISC_USEREVENT flag around calls to fb_blank - recursion > prevention was it's only job. > When grepping for FBINFO_MISC_USEREVENT I get a few hits not addressed in the patch below: drivers/video/fbdev/core/fbcon.c: if (!(info->flags & FBINFO_MISC_USEREVENT)) drivers/video/fbdev/core/fbmem.c: if (!ret && (flags & FBINFO_MISC_USEREVENT)) { drivers/video/fbdev/core/fbmem.c: info->flags &= ~FBINFO_MISC_USEREVENT; drivers/video/fbdev/core/fbmem.c: info->flags |= FBINFO_MISC_USEREVENT; drivers/video/fbdev/core/fbmem.c: info->flags &= ~FBINFO_MISC_USEREVENT; drivers/video/fbdev/core/fbmem.c: info->flags |= FBINFO_MISC_USEREVENT; drivers/video/fbdev/core/fbmem.c: info->flags &= ~FBINFO_MISC_USEREVENT; drivers/video/fbdev/core/fbsysfs.c: fb_info->flags |= FBINFO_MISC_USEREVENT; drivers/video/fbdev/core/fbsysfs.c: fb_info->flags &= ~FBINFO_MISC_USEREVENT; drivers/video/fbdev/core/fbsysfs.c: fb_info->flags |= FBINFO_MISC_USEREVENT; drivers/video/fbdev/core/fbsysfs.c: fb_info->flags &= ~FBINFO_MISC_USEREVENT; drivers/video/fbdev/ps3fb.c: info->flags |= FBINFO_MISC_USEREVENT; drivers/video/fbdev/ps3fb.c: info->flags &= ~FBINFO_MISC_USEREVENT; drivers/video/fbdev/sh_mobile_lcdcfb.c: * FBINFO_MISC_USEREVENT flag is set. Since we do not want to fake a include/linux/fb.h:#define FBINFO_MISC_USEREVENT 0x10000 /* event request The use in ps3fb looks like a candidate for removal and this file is not touch in this patch series, so I guess I did not miss it. As I did not apply the full series maybe some of the other users was already taken care of. Sam > Signed-off-by: Daniel Vetter > Cc: Daniel Vetter > Cc: Bartlomiej Zolnierkiewicz > Cc: Hans de Goede > Cc: Yisheng Xie > Cc: "Michał Mirosław" > Cc: Peter Rosin > Cc: Mikulas Patocka > Cc: Rob Clark > --- > drivers/video/fbdev/core/fbcon.c | 5 ++--- > drivers/video/fbdev/core/fbmem.c | 3 --- > drivers/video/fbdev/core/fbsysfs.c | 2 -- > 3 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c > index f85d794a3bee..c1a7476e980f 100644 > --- a/drivers/video/fbdev/core/fbcon.c > +++ b/drivers/video/fbdev/core/fbcon.c > @@ -2382,9 +2382,8 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch) > fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW); > ops->cursor_flash = (!blank); > > - if (!(info->flags & FBINFO_MISC_USEREVENT)) > - if (fb_blank(info, blank)) > - fbcon_generic_blank(vc, info, blank); > + if (fb_blank(info, blank)) > + fbcon_generic_blank(vc, info, blank); > } > > if (!blank) > diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c > index 7f95c7e80155..65a075ccac4a 100644 > --- a/drivers/video/fbdev/core/fbmem.c > +++ b/drivers/video/fbdev/core/fbmem.c > @@ -1194,10 +1194,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, > case FBIOBLANK: > console_lock(); > lock_fb_info(info); > - info->flags |= FBINFO_MISC_USEREVENT; > ret = fb_blank(info, arg); > - info->flags &= ~FBINFO_MISC_USEREVENT; > - > /* might again call into fb_blank */ > fbcon_fb_blanked(info, arg); > unlock_fb_info(info); > diff --git a/drivers/video/fbdev/core/fbsysfs.c b/drivers/video/fbdev/core/fbsysfs.c > index 252d4f52d2a5..882b471d619e 100644 > --- a/drivers/video/fbdev/core/fbsysfs.c > +++ b/drivers/video/fbdev/core/fbsysfs.c > @@ -310,9 +310,7 @@ static ssize_t store_blank(struct device *device, > > arg = simple_strtoul(buf, &last, 0); > console_lock(); > - fb_info->flags |= FBINFO_MISC_USEREVENT; > err = fb_blank(fb_info, arg); > - fb_info->flags &= ~FBINFO_MISC_USEREVENT; > /* might again call into fb_blank */ > fbcon_fb_blanked(fb_info, arg); > console_unlock(); > -- > 2.20.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Subject: Re: [PATCH 27/33] fbdev: remove FBINFO_MISC_USEREVENT around fb_blank Date: Mon, 20 May 2019 19:20:08 +0200 Message-ID: <20190520172008.GB27230@ravnborg.org> References: <20190520082216.26273-1-daniel.vetter@ffwll.ch> <20190520082216.26273-28-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20190520082216.26273-28-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: Bartlomiej Zolnierkiewicz , Intel Graphics Development , LKML , DRI Development , =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , Yisheng Xie , Mikulas Patocka , Daniel Vetter , Peter Rosin List-Id: dri-devel@lists.freedesktop.org SGkgRGFuaWVsLgoKPiBXaXRoIHRoZSByZWN1cnNpb24gYnJva2VuIGluIHRoZSBwcmV2aW91cyBw YXRjaCB3ZSBjYW4gZHJvcCB0aGUKPiBGQklORk9fTUlTQ19VU0VSRVZFTlQgZmxhZyBhcm91bmQg Y2FsbHMgdG8gZmJfYmxhbmsgLSByZWN1cnNpb24KPiBwcmV2ZW50aW9uIHdhcyBpdCdzIG9ubHkg am9iLgo+IApXaGVuIGdyZXBwaW5nIGZvciBGQklORk9fTUlTQ19VU0VSRVZFTlQgSSBnZXQgYSBm ZXcgaGl0cyBub3QgYWRkcmVzc2VkCmluIHRoZSBwYXRjaCBiZWxvdzoKCmRyaXZlcnMvdmlkZW8v ZmJkZXYvY29yZS9mYmNvbi5jOiAgICAgICAgICAgICAgICAgICAgICAgaWYgKCEoaW5mby0+Zmxh Z3MgJiBGQklORk9fTUlTQ19VU0VSRVZFTlQpKQpkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJt ZW0uYzogICAgICAgICAgICAgICAgICAgICAgIGlmICghcmV0ICYmIChmbGFncyAmIEZCSU5GT19N SVNDX1VTRVJFVkVOVCkpIHsKZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZibWVtLmM6ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGluZm8tPmZsYWdzICY9IH5GQklORk9fTUlTQ19VU0VS RVZFTlQ7CmRyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYm1lbS5jOiAgICAgICAgICAgICAgIGlu Zm8tPmZsYWdzIHw9IEZCSU5GT19NSVNDX1VTRVJFVkVOVDsKZHJpdmVycy92aWRlby9mYmRldi9j b3JlL2ZibWVtLmM6ICAgICAgICAgICAgICAgaW5mby0+ZmxhZ3MgJj0gfkZCSU5GT19NSVNDX1VT RVJFVkVOVDsKZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZibWVtLmM6ICAgICAgICAgICAgICAg aW5mby0+ZmxhZ3MgfD0gRkJJTkZPX01JU0NfVVNFUkVWRU5UOwpkcml2ZXJzL3ZpZGVvL2ZiZGV2 L2NvcmUvZmJtZW0uYzogICAgICAgICAgICAgICBpbmZvLT5mbGFncyAmPSB+RkJJTkZPX01JU0Nf VVNFUkVWRU5UOwpkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJzeXNmcy5jOiAgICAgZmJfaW5m by0+ZmxhZ3MgfD0gRkJJTkZPX01JU0NfVVNFUkVWRU5UOwpkcml2ZXJzL3ZpZGVvL2ZiZGV2L2Nv cmUvZmJzeXNmcy5jOiAgICAgZmJfaW5mby0+ZmxhZ3MgJj0gfkZCSU5GT19NSVNDX1VTRVJFVkVO VDsKZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2Zic3lzZnMuYzogICAgIGZiX2luZm8tPmZsYWdz IHw9IEZCSU5GT19NSVNDX1VTRVJFVkVOVDsKZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2Zic3lz ZnMuYzogICAgIGZiX2luZm8tPmZsYWdzICY9IH5GQklORk9fTUlTQ19VU0VSRVZFTlQ7CmRyaXZl cnMvdmlkZW8vZmJkZXYvcHMzZmIuYzogICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5mby0+ ZmxhZ3MgfD0gRkJJTkZPX01JU0NfVVNFUkVWRU5UOwpkcml2ZXJzL3ZpZGVvL2ZiZGV2L3BzM2Zi LmM6ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluZm8tPmZsYWdzICY9IH5GQklORk9fTUlT Q19VU0VSRVZFTlQ7CmRyaXZlcnMvdmlkZW8vZmJkZXYvc2hfbW9iaWxlX2xjZGNmYi5jOiAgKiBG QklORk9fTUlTQ19VU0VSRVZFTlQgZmxhZyBpcyBzZXQuIFNpbmNlIHdlIGRvIG5vdCB3YW50IHRv IGZha2UgYQppbmNsdWRlL2xpbnV4L2ZiLmg6I2RlZmluZSBGQklORk9fTUlTQ19VU0VSRVZFTlQg ICAgICAgICAgMHgxMDAwMCAvKiBldmVudCByZXF1ZXN0CgpUaGUgdXNlIGluIHBzM2ZiIGxvb2tz IGxpa2UgYSBjYW5kaWRhdGUgZm9yIHJlbW92YWwgYW5kIHRoaXMgZmlsZSBpcyBub3QKdG91Y2gg aW4gdGhpcyBwYXRjaCBzZXJpZXMsIHNvIEkgZ3Vlc3MgSSBkaWQgbm90IG1pc3MgaXQuCgpBcyBJ IGRpZCBub3QgYXBwbHkgdGhlIGZ1bGwgc2VyaWVzIG1heWJlIHNvbWUgb2YgdGhlIG90aGVyIHVz ZXJzIHdhcwphbHJlYWR5IHRha2VuIGNhcmUgb2YuCgoKCVNhbQoKPiBTaWduZWQtb2ZmLWJ5OiBE YW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KPiBDYzogRGFuaWVsIFZldHRl ciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KPiBDYzogQmFydGxvbWllaiBab2xuaWVya2lld2lj eiA8Yi56b2xuaWVya2llQHNhbXN1bmcuY29tPgo+IENjOiBIYW5zIGRlIEdvZWRlIDxoZGVnb2Vk ZUByZWRoYXQuY29tPgo+IENjOiBZaXNoZW5nIFhpZSA8eXN4aWVAZm94bWFpbC5jb20+Cj4gQ2M6 ICJNaWNoYcWCIE1pcm9zxYJhdyIgPG1pcnEtbGludXhAcmVyZS5xbXFtLnBsPgo+IENjOiBQZXRl ciBSb3NpbiA8cGVkYUBheGVudGlhLnNlPgo+IENjOiBNaWt1bGFzIFBhdG9ja2EgPG1wYXRvY2th QHJlZGhhdC5jb20+Cj4gQ2M6IFJvYiBDbGFyayA8cm9iZGNsYXJrQGdtYWlsLmNvbT4KPiAtLS0K PiAgZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZiY29uLmMgICB8IDUgKystLS0KPiAgZHJpdmVy cy92aWRlby9mYmRldi9jb3JlL2ZibWVtLmMgICB8IDMgLS0tCj4gIGRyaXZlcnMvdmlkZW8vZmJk ZXYvY29yZS9mYnN5c2ZzLmMgfCAyIC0tCj4gIDMgZmlsZXMgY2hhbmdlZCwgMiBpbnNlcnRpb25z KCspLCA4IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2 L2NvcmUvZmJjb24uYyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYmNvbi5jCj4gaW5kZXgg Zjg1ZDc5NGEzYmVlLi5jMWE3NDc2ZTk4MGYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy92aWRlby9m YmRldi9jb3JlL2ZiY29uLmMKPiArKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJjb24u Ywo+IEBAIC0yMzgyLDkgKzIzODIsOCBAQCBzdGF0aWMgaW50IGZiY29uX2JsYW5rKHN0cnVjdCB2 Y19kYXRhICp2YywgaW50IGJsYW5rLCBpbnQgbW9kZV9zd2l0Y2gpCj4gIAkJCWZiY29uX2N1cnNv cih2YywgYmxhbmsgPyBDTV9FUkFTRSA6IENNX0RSQVcpOwo+ICAJCQlvcHMtPmN1cnNvcl9mbGFz aCA9ICghYmxhbmspOwo+ICAKPiAtCQkJaWYgKCEoaW5mby0+ZmxhZ3MgJiBGQklORk9fTUlTQ19V U0VSRVZFTlQpKQo+IC0JCQkJaWYgKGZiX2JsYW5rKGluZm8sIGJsYW5rKSkKPiAtCQkJCQlmYmNv bl9nZW5lcmljX2JsYW5rKHZjLCBpbmZvLCBibGFuayk7Cj4gKwkJCWlmIChmYl9ibGFuayhpbmZv LCBibGFuaykpCj4gKwkJCQlmYmNvbl9nZW5lcmljX2JsYW5rKHZjLCBpbmZvLCBibGFuayk7Cj4g IAkJfQo+ICAKPiAgCQlpZiAoIWJsYW5rKQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3ZpZGVvL2Zi ZGV2L2NvcmUvZmJtZW0uYyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYm1lbS5jCj4gaW5k ZXggN2Y5NWM3ZTgwMTU1Li42NWEwNzVjY2FjNGEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy92aWRl by9mYmRldi9jb3JlL2ZibWVtLmMKPiArKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJt ZW0uYwo+IEBAIC0xMTk0LDEwICsxMTk0LDcgQEAgc3RhdGljIGxvbmcgZG9fZmJfaW9jdGwoc3Ry dWN0IGZiX2luZm8gKmluZm8sIHVuc2lnbmVkIGludCBjbWQsCj4gIAljYXNlIEZCSU9CTEFOSzoK PiAgCQljb25zb2xlX2xvY2soKTsKPiAgCQlsb2NrX2ZiX2luZm8oaW5mbyk7Cj4gLQkJaW5mby0+ ZmxhZ3MgfD0gRkJJTkZPX01JU0NfVVNFUkVWRU5UOwo+ICAJCXJldCA9IGZiX2JsYW5rKGluZm8s IGFyZyk7Cj4gLQkJaW5mby0+ZmxhZ3MgJj0gfkZCSU5GT19NSVNDX1VTRVJFVkVOVDsKPiAtCj4g IAkJLyogbWlnaHQgYWdhaW4gY2FsbCBpbnRvIGZiX2JsYW5rICovCj4gIAkJZmJjb25fZmJfYmxh bmtlZChpbmZvLCBhcmcpOwo+ICAJCXVubG9ja19mYl9pbmZvKGluZm8pOwo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJzeXNmcy5jIGIvZHJpdmVycy92aWRlby9mYmRl di9jb3JlL2Zic3lzZnMuYwo+IGluZGV4IDI1MmQ0ZjUyZDJhNS4uODgyYjQ3MWQ2MTllIDEwMDY0 NAo+IC0tLSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYnN5c2ZzLmMKPiArKysgYi9kcml2 ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJzeXNmcy5jCj4gQEAgLTMxMCw5ICszMTAsNyBAQCBzdGF0 aWMgc3NpemVfdCBzdG9yZV9ibGFuayhzdHJ1Y3QgZGV2aWNlICpkZXZpY2UsCj4gIAo+ICAJYXJn ID0gc2ltcGxlX3N0cnRvdWwoYnVmLCAmbGFzdCwgMCk7Cj4gIAljb25zb2xlX2xvY2soKTsKPiAt CWZiX2luZm8tPmZsYWdzIHw9IEZCSU5GT19NSVNDX1VTRVJFVkVOVDsKPiAgCWVyciA9IGZiX2Js YW5rKGZiX2luZm8sIGFyZyk7Cj4gLQlmYl9pbmZvLT5mbGFncyAmPSB+RkJJTkZPX01JU0NfVVNF UkVWRU5UOwo+ICAJLyogbWlnaHQgYWdhaW4gY2FsbCBpbnRvIGZiX2JsYW5rICovCj4gIAlmYmNv bl9mYl9ibGFua2VkKGZiX2luZm8sIGFyZyk7Cj4gIAljb25zb2xlX3VubG9jaygpOwo+IC0tIAo+ IDIuMjAuMQo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCj4gZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=