diff options
| author | Dave Airlie | 2020-04-08 09:14:21 +1000 |
|---|---|---|
| committer | Dave Airlie | 2020-04-08 09:14:34 +1000 |
| commit | 3208a24f2ba2e666908619d51173ca62b08f3a75 (patch) | |
| tree | e17f34a89490f0f845ceb735926514f7abff196a /drivers/video | |
| parent | 0a1a6793d0f8960a0d4170bdb983efa58fbd5946 (diff) | |
| parent | d8a26d8fc37c5b8b9e95f2fa194f287cf8cab3f4 (diff) | |
Merge tag 'drm-misc-next-fixes-2020-04-04' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
A bunch of fixes to avoid null pointer dereference in fbcon, fix a return
in xen, some DT bindings fixes, a vc4 issue with 1920x1200 mode validation,
and a conflicting framebuffer in vboxvideo.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200404090057.a3m7uw6tavwtcyon@gilmour.lan
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/core/fbcon.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 28335788e76e..9d28a8e3328f 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1282,6 +1282,9 @@ finished: if (!con_is_bound(&fb_con)) fbcon_exit(); + if (vc->vc_num == logo_shown) + logo_shown = FBCON_LOGO_CANSHOW; + return; } |