Skip to content

Commit fe0ce53

Browse files
committed
Revert "fbdev: Disable sysfb device registration when removing conflicting FBs"
This reverts commit ee7a69a.
1 parent 65c9a96 commit fe0ce53

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

drivers/video/fbdev/core/fbmem.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <linux/kernel.h>
2020
#include <linux/major.h>
2121
#include <linux/slab.h>
22-
#include <linux/sysfb.h>
2322
#include <linux/mm.h>
2423
#include <linux/mman.h>
2524
#include <linux/vt.h>
@@ -1777,17 +1776,6 @@ int remove_conflicting_framebuffers(struct apertures_struct *a,
17771776
do_free = true;
17781777
}
17791778

1780-
/*
1781-
* If a driver asked to unregister a platform device registered by
1782-
* sysfb, then can be assumed that this is a driver for a display
1783-
* that is set up by the system firmware and has a generic driver.
1784-
*
1785-
* Drivers for devices that don't have a generic driver will never
1786-
* ask for this, so let's assume that a real driver for the display
1787-
* was already probed and prevent sysfb to register devices later.
1788-
*/
1789-
sysfb_disable();
1790-
17911779
mutex_lock(&registration_lock);
17921780
do_remove_conflicting_framebuffers(a, name, primary);
17931781
mutex_unlock(&registration_lock);

0 commit comments

Comments
 (0)