linux-stable.git/drivers/video/fbdev/core/fbmem.c, branch v5.3

fbcon: Call con2fb_map functions directly

2019-06-12T18:30:39+00:00

These are actually fbcon ioctls which just happen to be exposed
through /dev/fb*. They completely ignore which fb_info they're called
on, and I think the userspace tool even hardcodes to /dev/fb0.

Hence just forward the entire thing to fbcon.c wholesale.

Note that this patch drops the fb_lock/unlock on the set side. Since
the ioctl can operate on any fb (as passed in through
con2fb.framebuffer) this is bogus. Also note that fbcon.c in general
never calls fb_lock on anything, so this has been badly broken
already.

With this the last user of the fbcon notifier callback is gone, and we
can garbage collect that too.

v2: add missing uaccess.h include (alpha fails to compile otherwise),
reported by kbuild.

v3: Remember to also drop the #defines (Maarten)

v4: Add the static inline to dummy functions.

Signed-off-by: Daniel Vetter 
Reviewed-by: Sam Ravnborg 
Reviewed-by: Maarten Lankhorst 
Cc: Maarten Lankhorst 
Cc: Daniel Vetter 
Cc: Bartlomiej Zolnierkiewicz 
Cc: Hans de Goede 
Cc: Yisheng Xie 
Cc: "Michał Mirosław" 
Cc: Peter Rosin 
Cc: Mikulas Patocka 
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-31-daniel.vetter@ffwll.ch

fbcon: replace FB_EVENT_MODE_CHANGE/_ALL with direct calls

2019-06-12T18:30:21+00:00

Create a new wrapper function for this, feels like there's some
refactoring room here between the two modes.

v2: backlight notifier is also interested in the mode change event,
it calls lcd->set_mode, of which there are 3 implementations. Thanks
to Maarten for spotting this. So we keep that. We can ditch the differentiation
between mode change and all mode changes (because backlight notifier
doesn't care), and we can drop the FBINFO_MISC_USEREVENT stuff too,
because that's just to prevent recursion between fbmem.c and fbcon.c.

While at it flatten the control flow a bit.

v3: Need to add a static inline to the dummy function.

v4: Add missing #include  to sh_mob (Sam).

Cc: Sam Ravnborg 
Signed-off-by: Daniel Vetter 
Reviewed-by: Sam Ravnborg 
Reviewed-by: Maarten Lankhorst 
Acked-by: Daniel Thompson 
Cc: Maarten Lankhorst 
Cc: Lee Jones 
Cc: Daniel Thompson 
Cc: Jingoo Han 
Cc: Bartlomiej Zolnierkiewicz 
Cc: Daniel Vetter 
Cc: Hans de Goede 
Cc: Yisheng Xie 
Cc: "Michał Mirosław" 
Cc: Peter Rosin 
Cc: Mikulas Patocka 
Cc: linux-fbdev@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-29-daniel.vetter@ffwll.ch

fb: Flatten control flow in fb_set_var

2019-06-12T18:30:11+00:00

Instead of wiring almost everything down to the very last line using
goto soup (but not consistently, where would the fun be otherwise)
drop out early when checks fail. This allows us to flatten the huge
indent levels to just 1.

Aside: If a driver doesn't set ->fb_check_var, then FB_ACTIVATE_NOW
does nothing. This bug exists ever since this code was extracted as a
common helper in 2002, hence I decided against fixing it. Everyone
just better have a fb_check_var to make sure things work correctly.

Signed-off-by: Daniel Vetter 
Reviewed-by: Sam Ravnborg 
Reviewed-by: Maarten Lankhorst 
Cc: Daniel Vetter 
Cc: Bartlomiej Zolnierkiewicz 
Cc: "Michał Mirosław" 
Cc: Peter Rosin 
Cc: Hans de Goede 
Cc: Mikulas Patocka 
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-28-daniel.vetter@ffwll.ch

fbdev: remove FBINFO_MISC_USEREVENT around fb_blank

2019-06-12T18:30:06+00:00

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.

Signed-off-by: Daniel Vetter 
Reviewed-by: Sam Ravnborg 
Reviewed-by: Maarten Lankhorst 
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 
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-27-daniel.vetter@ffwll.ch

fbmem: pull fbcon_fb_blanked out of fb_blank

2019-06-12T18:30:00+00:00

There's a callchain of:

fbcon_fb_blanked -> do_(un)blank_screen -> consw->con_blank
	-> fbcon_blank -> fb_blank

Things don't go horribly wrong because the BKL console_lock safes the
day, but that's about it. And the seeming recursion is broken in 2
ways:
- Starting from the fbdev ioctl we set FBINFO_MISC_USEREVENT, which
  tells the fbcon_blank code to not call fb_blank. This was required
  to not deadlock when recursing on the fb_notifier_chain mutex.
- Starting from the con_blank hook we're getting saved by the
  console_blanked checks in do_blank/unblank_screen. Or at least
  that's my theory.

Anyway, recursion isn't awesome, so let's stop it. Breaking the
recursion avoids the need to be in the FBINFO_MISC_USEREVENT critical
section, so lets move it out of that too.

The astute reader will notice that fb_blank seems to require
lock_fb_info(), which the fbcon code seems to ignore. I have no idea
how to fix that problem, so let's keep ignoring it.

v2: I forgot the sysfs blanking code.

v3: Fix typo in callchain in the commmit message (Sam).

Signed-off-by: Daniel Vetter 
Reviewed-by: Sam Ravnborg 
Reviewed-by: Maarten Lankhorst 
Cc: Sam Ravnborg 
Cc: Daniel Vetter 
Cc: Bartlomiej Zolnierkiewicz 
Cc: "Michał Mirosław" 
Cc: Peter Rosin 
Cc: Hans de Goede 
Cc: Mikulas Patocka 
Cc: Rob Clark 
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-26-daniel.vetter@ffwll.ch

Revert "backlight/fbcon: Add FB_EVENT_CONBLANK"

2019-06-12T18:29:40+00:00

This reverts commit 994efacdf9a087b52f71e620b58dfa526b0cf928.

The justification is that if hw blanking fails (i.e. fbops->fb_blank)
fails, then we still want to shut down the backlight. Which is exactly
_not_ what fb_blank() does and so rather inconsistent if we end up
with different behaviour between fbcon and direct fbdev usage. Given
that the entire notifier maze is getting in the way anyway I figured
it's simplest to revert this not well justified commit.

v2: Add static inline to the dummy version.

Cc: Richard Purdie 
Signed-off-by: Daniel Vetter 
Reviewed-by: Sam Ravnborg 
Reviewed-by: Maarten Lankhorst 
Acked-by: Daniel Thompson 
Cc: Lee Jones 
Cc: Daniel Thompson 
Cc: Jingoo Han 
Cc: Bartlomiej Zolnierkiewicz 
Cc: Daniel Vetter 
Cc: Hans de Goede 
Cc: Yisheng Xie 
Cc: linux-fbdev@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-25-daniel.vetter@ffwll.ch

fbdev: Call fbcon_get_requirement directly

2019-06-12T18:29:22+00:00

Pretty simple case really.

v2: Forgot to remove a break;

v3: Add static inline to the dummy versions.

Signed-off-by: Daniel Vetter 
Reviewed-by: Sam Ravnborg 
Reviewed-by: Maarten Lankhorst 
Cc: Bartlomiej Zolnierkiewicz 
Cc: Daniel Vetter 
Cc: Hans de Goede 
Cc: "Steven Rostedt (VMware)" 
Cc: Prarit Bhargava 
Cc: Kees Cook 
Cc: Yisheng Xie 
Cc: "Michał Mirosław" 
Cc: Peter Rosin 
Cc: Mikulas Patocka 
Cc: linux-fbdev@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-24-daniel.vetter@ffwll.ch

fbcon: Call fbcon_mode_deleted/new_modelist directly

2019-06-12T18:29:16+00:00

I'm not entirely clear on what new_modelist actually does, it seems
exclusively for a sysfs interface. Which in the end does amount to a
normal fb_set_par to check the mode, but then takes a different path
in both fbmem.c and fbcon.c.

I have no idea why these 2 paths are different, but then I also don't
really want to find out. So just do the simple conversion to a direct
function call.

v2: static inline for the dummy versions, I forgot.

Signed-off-by: Daniel Vetter 
Reviewed-by: Sam Ravnborg 
Reviewed-by: Maarten Lankhorst 
Cc: Bartlomiej Zolnierkiewicz 
Cc: Daniel Vetter 
Cc: Hans de Goede 
Cc: Mikulas Patocka 
Cc: Sergey Senozhatsky 
Cc: Kees Cook 
Cc: Peter Rosin 
Cc: Yisheng Xie 
Cc: "Michał Mirosław" 
Cc: linux-fbdev@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-23-daniel.vetter@ffwll.ch

fbdev: directly call fbcon_suspended/resumed

2019-06-12T18:29:10+00:00

With the sh_mobile notifier removed we can just directly call the
fbcon code here.

v2: Remove now unused local variable.

v3: fixup !CONFIG_FRAMEBUFFER_CONSOLE, noticed by kbuild

Signed-off-by: Daniel Vetter 
Reviewed-by: Sam Ravnborg 
Reviewed-by: Maarten Lankhorst 
Cc: Bartlomiej Zolnierkiewicz 
Cc: Daniel Vetter 
Cc: Hans de Goede 
Cc: Greg Kroah-Hartman 
Cc: Prarit Bhargava 
Cc: Kees Cook 
Cc: Konstantin Khorenko 
Cc: Yisheng Xie 
Cc: "Michał Mirosław" 
Cc: Peter Rosin 
Cc: Mikulas Patocka 
Cc: linux-fbdev@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-22-daniel.vetter@ffwll.ch

fbdev: unify unlink_framebuffer paths

2019-06-12T18:28:57+00:00

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 
Reviewed-by: Sam Ravnborg 
Reviewed-by: Maarten Lankhorst 
Cc: Maarten Lankhorst 
Cc: Bartlomiej Zolnierkiewicz 
Cc: Daniel Vetter 
Cc: "Michał Mirosław" 
Cc: Peter Rosin 
Cc: Hans de Goede 
Cc: Mikulas Patocka 
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-20-daniel.vetter@ffwll.ch