leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/fb-helper: call vga_remove_vgacon automatically.

Browse Source 
Add vga_remove_vgacon() call to
drm_fb_helper_remove_conflicting_pci_framebuffers().

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20190301092502.30948-3-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2019-03-01 10:25:00 +01:00
parent c6b38fbbde
commit 1c74ca7a1a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/drm/drm_fb_helper.h
View File

@ -36,6 +36,7 @@ struct drm_fb_helper;
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_device.h> #include <drm/drm_device.h>
#include <linux/kgdb.h> #include <linux/kgdb.h>
#include <linux/vgaarb.h>
enum mode_set_atomic { enum mode_set_atomic {
LEAVE_ATOMIC_MODE_SET, LEAVE_ATOMIC_MODE_SET,
@ -642,11 +643,18 @@ drm_fb_helper_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
int resource_id, int resource_id,
const char *name) const char *name)
{ {
int ret = 0;
/*
* WARNING: Apparently we must kick fbdev drivers before vgacon,
* otherwise the vga fbdev driver falls over.
*/
#if IS_REACHABLE(CONFIG_FB) #if IS_REACHABLE(CONFIG_FB)
return remove_conflicting_pci_framebuffers(pdev, resource_id, name); ret = remove_conflicting_pci_framebuffers(pdev, resource_id, name);
#else
return 0;
#endif #endif
if (ret == 0)
ret = vga_remove_vgacon(pdev);
return ret;
} }
#endif #endif