lkml.org 
[lkml]   [2018]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 048/131] fbdev/core: Disable console-lock warnings when fb.lockless_register_fb is set
    Date
    From: Thomas Zimmermann <tzimmermann@suse.de>

    [ Upstream commit 3f2ce54284a60500eb6dca1dca6fd615df8f9aa3 ]

    If the console is unlocked during registration, the console subsystem
    generates significant amounts of warnings, which obfuscate actual
    debugging messages. Setting ignore_console_lock_warning while debugging
    console registration avoid the noise.

    v3:
    - manipulate ignore_console_lock_warning with atomic_{inc,dec}
    v2:
    - restore ignore_console_lock_warning if lock_fb_info() fails

    Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    Reviewed-by: Petr Mladek <pmladek@suse.com>
    Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
    Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/video/fbdev/core/fbmem.c | 13 +++++++++----
    1 file changed, 9 insertions(+), 4 deletions(-)

    diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
    index 609438d2465b..0b6a2d1eb5bb 100644
    --- a/drivers/video/fbdev/core/fbmem.c
    +++ b/drivers/video/fbdev/core/fbmem.c
    @@ -1691,17 +1691,22 @@ static int do_register_framebuffer(struct fb_info *fb_info)
    event.info = fb_info;
    if (!lockless_register_fb)
    console_lock();
    + else
    + atomic_inc(&ignore_console_lock_warning);
    if (!lock_fb_info(fb_info)) {
    - if (!lockless_register_fb)
    - console_unlock();
    - return -ENODEV;
    + ret = -ENODEV;
    + goto unlock_console;
    }
    + ret = 0;

    fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
    unlock_fb_info(fb_info);
    +unlock_console:
    if (!lockless_register_fb)
    console_unlock();
    - return 0;
    + else
    + atomic_dec(&ignore_console_lock_warning);
    + return ret;
    }

    static int do_unregister_framebuffer(struct fb_info *fb_info)
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-02 15:34    [W:2.256 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site