From: Daniel Vetter <daniel.vetter@ffwll.ch> To: LKML <linux-kernel@vger.kernel.org> Cc: "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "DRI Development" <dri-devel@lists.freedesktop.org>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Daniel Vetter" <daniel.vetter@intel.com>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung.com>, "Michał Mirosław" <mirq-linux@rere.qmqm.pl>, "Peter Rosin" <peda@axentia.se>, "Hans de Goede" <hdegoede@redhat.com>, "Mikulas Patocka" <mpatocka@redhat.com> Subject: [PATCH 19/33] fbdev: unify unlink_framebuffer paths Date: Fri, 24 May 2019 10:53:40 +0200 [thread overview] Message-ID: <20190524085354.27411-20-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20190524085354.27411-1-daniel.vetter@ffwll.ch> For some reasons the pm_vt_switch_unregister call was missing from the direct unregister_framebuffer path. Fix this. v2: fbinfo->dev is used to decided whether unlink_framebuffer has been called already. I botched that in v1. Make this all clearer by inlining __unlink_framebuffer. v3: Fix typoe in subject (Maarten). Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl> Cc: Peter Rosin <peda@axentia.se> Cc: Hans de Goede <hdegoede@redhat.com> Cc: Mikulas Patocka <mpatocka@redhat.com> --- drivers/video/fbdev/core/fbmem.c | 47 ++++++++++++++------------------ 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index f3bcad30d3ba..bee45e9405b8 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1722,15 +1722,30 @@ static void unbind_console(struct fb_info *fb_info) console_unlock(); } -static void __unlink_framebuffer(struct fb_info *fb_info); - -static void do_unregister_framebuffer(struct fb_info *fb_info) +void unlink_framebuffer(struct fb_info *fb_info) { - unbind_console(fb_info); + int i; + + i = fb_info->node; + if (WARN_ON(i < 0 || i >= FB_MAX || registered_fb[i] != fb_info)) + return; + + if (!fb_info->dev) + return; + + device_destroy(fb_class, MKDEV(FB_MAJOR, i)); pm_vt_switch_unregister(fb_info->dev); - __unlink_framebuffer(fb_info); + unbind_console(fb_info); + + fb_info->dev = NULL; +} +EXPORT_SYMBOL(unlink_framebuffer); + +static void do_unregister_framebuffer(struct fb_info *fb_info) +{ + unlink_framebuffer(fb_info); if (fb_info->pixmap.addr && (fb_info->pixmap.flags & FB_PIXMAP_DEFAULT)) kfree(fb_info->pixmap.addr); @@ -1753,28 +1768,6 @@ static void do_unregister_framebuffer(struct fb_info *fb_info) put_fb_info(fb_info); } -static void __unlink_framebuffer(struct fb_info *fb_info) -{ - int i; - - i = fb_info->node; - if (WARN_ON(i < 0 || i >= FB_MAX || registered_fb[i] != fb_info)) - return; - - if (fb_info->dev) { - device_destroy(fb_class, MKDEV(FB_MAJOR, i)); - fb_info->dev = NULL; - } -} - -void unlink_framebuffer(struct fb_info *fb_info) -{ - __unlink_framebuffer(fb_info); - - unbind_console(fb_info); -} -EXPORT_SYMBOL(unlink_framebuffer); - /** * remove_conflicting_framebuffers - remove firmware-configured framebuffers * @a: memory range, users of which are to be removed -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch> To: LKML <linux-kernel@vger.kernel.org> Cc: "Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "DRI Development" <dri-devel@lists.freedesktop.org>, "Michał Mirosław" <mirq-linux@rere.qmqm.pl>, "Mikulas Patocka" <mpatocka@redhat.com>, "Daniel Vetter" <daniel.vetter@intel.com>, "Peter Rosin" <peda@axentia.se> Subject: [PATCH 19/33] fbdev: unify unlink_framebuffer paths Date: Fri, 24 May 2019 10:53:40 +0200 [thread overview] Message-ID: <20190524085354.27411-20-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20190524085354.27411-1-daniel.vetter@ffwll.ch> For some reasons the pm_vt_switch_unregister call was missing from the direct unregister_framebuffer path. Fix this. v2: fbinfo->dev is used to decided whether unlink_framebuffer has been called already. I botched that in v1. Make this all clearer by inlining __unlink_framebuffer. v3: Fix typoe in subject (Maarten). Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl> Cc: Peter Rosin <peda@axentia.se> Cc: Hans de Goede <hdegoede@redhat.com> Cc: Mikulas Patocka <mpatocka@redhat.com> --- drivers/video/fbdev/core/fbmem.c | 47 ++++++++++++++------------------ 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index f3bcad30d3ba..bee45e9405b8 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1722,15 +1722,30 @@ static void unbind_console(struct fb_info *fb_info) console_unlock(); } -static void __unlink_framebuffer(struct fb_info *fb_info); - -static void do_unregister_framebuffer(struct fb_info *fb_info) +void unlink_framebuffer(struct fb_info *fb_info) { - unbind_console(fb_info); + int i; + + i = fb_info->node; + if (WARN_ON(i < 0 || i >= FB_MAX || registered_fb[i] != fb_info)) + return; + + if (!fb_info->dev) + return; + + device_destroy(fb_class, MKDEV(FB_MAJOR, i)); pm_vt_switch_unregister(fb_info->dev); - __unlink_framebuffer(fb_info); + unbind_console(fb_info); + + fb_info->dev = NULL; +} +EXPORT_SYMBOL(unlink_framebuffer); + +static void do_unregister_framebuffer(struct fb_info *fb_info) +{ + unlink_framebuffer(fb_info); if (fb_info->pixmap.addr && (fb_info->pixmap.flags & FB_PIXMAP_DEFAULT)) kfree(fb_info->pixmap.addr); @@ -1753,28 +1768,6 @@ static void do_unregister_framebuffer(struct fb_info *fb_info) put_fb_info(fb_info); } -static void __unlink_framebuffer(struct fb_info *fb_info) -{ - int i; - - i = fb_info->node; - if (WARN_ON(i < 0 || i >= FB_MAX || registered_fb[i] != fb_info)) - return; - - if (fb_info->dev) { - device_destroy(fb_class, MKDEV(FB_MAJOR, i)); - fb_info->dev = NULL; - } -} - -void unlink_framebuffer(struct fb_info *fb_info) -{ - __unlink_framebuffer(fb_info); - - unbind_console(fb_info); -} -EXPORT_SYMBOL(unlink_framebuffer); - /** * remove_conflicting_framebuffers - remove firmware-configured framebuffers * @a: memory range, users of which are to be removed -- 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-05-24 8:55 UTC|newest] Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-24 8:53 [PATCH 00/33] fbcon notifier begone! Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 01/33] dummycon: Sprinkle locking checks Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 02/33] fbdev: locking check for fb_set_suspend Daniel Vetter 2019-05-24 8:53 ` [PATCH 03/33] vt: might_sleep() annotation for do_blank_screen Daniel Vetter 2019-05-24 8:53 ` [PATCH 04/33] vt: More locking checks Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-27 7:08 ` Daniel Vetter 2019-05-27 7:08 ` Daniel Vetter 2019-05-27 7:22 ` Greg Kroah-Hartman 2019-05-24 8:53 ` [PATCH 05/33] fbdev/sa1100fb: Remove dead code Daniel Vetter 2019-05-24 8:53 ` [PATCH 06/33] fbdev/cyber2000: Remove struct display Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 07/33] fbdev/aty128fb: Remove dead code Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 08/33] fbcon: s/struct display/struct fbcon_display/ Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 09/33] fbcon: Remove fbcon_has_exited Daniel Vetter 2019-05-25 15:38 ` Sam Ravnborg 2019-05-25 15:38 ` Sam Ravnborg 2019-05-27 6:10 ` Daniel Vetter 2019-05-27 6:10 ` Daniel Vetter 2019-05-27 6:51 ` Sam Ravnborg 2019-05-27 6:51 ` Sam Ravnborg 2019-05-24 8:53 ` [PATCH 10/33] fbcon: call fbcon_fb_(un)registered directly Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 11/33] fbdev/sh_mobile: remove sh_mobile_lcdc_display_notify Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-25 15:01 ` Sam Ravnborg 2019-05-25 15:01 ` Sam Ravnborg 2019-05-27 6:13 ` Daniel Vetter 2019-05-27 6:52 ` Sam Ravnborg 2019-05-24 8:53 ` [PATCH 12/33] fbdev/omap: sysfs files can't disappear before the device is gone Daniel Vetter 2019-05-24 8:53 ` [PATCH 13/33] fbdev: " Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 14/33] staging/olpc: lock_fb_info can't fail Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-27 7:10 ` Daniel Vetter 2019-05-27 7:22 ` Greg KH 2019-05-27 7:22 ` Greg KH 2019-05-24 8:53 ` [PATCH 15/33] fbdev/atyfb: " Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 16/33] fbdev: lock_fb_info cannot fail Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 17/33] fbcon: call fbcon_fb_bind directly Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 18/33] fbdev: make unregister/unlink functions not fail Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter [this message] 2019-05-24 8:53 ` [PATCH 19/33] fbdev: unify unlink_framebuffer paths Daniel Vetter 2019-05-24 8:53 ` [PATCH 20/33] fbdev/sh_mob: Remove fb notifier callback Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 21/33] fbdev: directly call fbcon_suspended/resumed Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 22/33] fbcon: Call fbcon_mode_deleted/new_modelist directly Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 23/33] fbdev: Call fbcon_get_requirement directly Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 24/33] Revert "backlight/fbcon: Add FB_EVENT_CONBLANK" Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 13:14 ` Daniel Thompson 2019-05-24 13:14 ` Daniel Thompson 2019-05-24 13:14 ` Daniel Thompson 2019-05-24 15:28 ` Daniel Vetter 2019-05-24 15:28 ` Daniel Vetter 2019-05-27 10:59 ` Bartlomiej Zolnierkiewicz 2019-05-27 10:59 ` Bartlomiej Zolnierkiewicz 2019-05-24 8:53 ` [PATCH 25/33] fbmem: pull fbcon_fb_blanked out of fb_blank Daniel Vetter 2019-05-25 17:00 ` Sam Ravnborg 2019-05-25 17:00 ` Sam Ravnborg 2019-05-24 8:53 ` [PATCH 26/33] fbdev: remove FBINFO_MISC_USEREVENT around fb_blank Daniel Vetter 2019-05-24 8:53 ` [PATCH 27/33] fb: Flatten control flow in fb_set_var Daniel Vetter 2019-05-24 8:53 ` [PATCH 28/33] fbcon: replace FB_EVENT_MODE_CHANGE/_ALL with direct calls Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 29/33] vgaswitcheroo: call fbcon_remap_all directly Daniel Vetter 2019-05-24 8:53 ` Daniel Vetter 2019-05-24 8:53 ` [PATCH 30/33] fbcon: Call con2fb_map functions directly Daniel Vetter 2019-05-24 8:53 ` [PATCH 31/33] fbcon: Document what I learned about fbcon locking Daniel Vetter 2019-05-24 8:53 ` [PATCH 32/33] staging/olpc_dcon: Add drm conversion to TODO Daniel Vetter 2019-05-27 7:11 ` Daniel Vetter 2019-05-27 7:11 ` Daniel Vetter 2019-05-27 7:22 ` Greg KH 2019-05-24 8:53 ` [PATCH 33/33] backlight: simplify lcd notifier Daniel Vetter 2019-05-24 11:03 ` ✗ Fi.CI.CHECKPATCH: warning for fbcon notifier begone! (rev3) Patchwork 2019-05-24 11:18 ` ✗ Fi.CI.SPARSE: " Patchwork 2019-05-24 11:23 ` ✓ Fi.CI.BAT: success " Patchwork 2019-05-25 17:19 ` [PATCH 00/33] fbcon notifier begone! Sam Ravnborg 2019-05-27 7:17 ` Daniel Vetter 2019-05-27 11:56 ` Daniel Vetter 2019-05-25 17:24 ` ✗ Fi.CI.IGT: failure for fbcon notifier begone! (rev3) Patchwork 2019-05-26 15:34 ` ✗ Fi.CI.CHECKPATCH: warning for fbcon notifier begone! (rev4) Patchwork 2019-05-26 15:49 ` ✗ Fi.CI.SPARSE: " Patchwork 2019-05-26 15:53 ` ✓ Fi.CI.BAT: success " Patchwork 2019-05-27 11:02 ` ✓ Fi.CI.IGT: " Patchwork 2019-05-28 9:02 [PATCH 00/33] fbcon notifier begone v3! Daniel Vetter 2019-05-28 9:02 ` [PATCH 19/33] fbdev: unify unlink_framebuffer paths Daniel Vetter 2019-05-28 9:02 ` Daniel Vetter 2019-05-28 9:02 ` Daniel Vetter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190524085354.27411-20-daniel.vetter@ffwll.ch \ --to=daniel.vetter@ffwll.ch \ --cc=b.zolnierkie@samsung.com \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=hdegoede@redhat.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=mirq-linux@rere.qmqm.pl \ --cc=mpatocka@redhat.com \ --cc=peda@axentia.se \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.