There is currently no non-fbdev mechanism in place to kick out simpledrm when the real hw-driver is probed. As a stop gap until that is in place, honour remove_conflicting_framebuffers() and delete the simple-framebuffer platform device when it's called.
Signed-off-by: Noralf Trønnes noralf@tronnes.org --- drivers/gpu/drm/simpledrm/Kconfig | 5 ++++ drivers/gpu/drm/simpledrm/Makefile | 2 +- drivers/gpu/drm/simpledrm/simpledrm.h | 9 +++++++ drivers/gpu/drm/simpledrm/simpledrm_drv.c | 3 +++ drivers/gpu/drm/simpledrm/simpledrm_fbdev.c | 40 +++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/simpledrm/Kconfig b/drivers/gpu/drm/simpledrm/Kconfig index 9454536..6205b17 100644 --- a/drivers/gpu/drm/simpledrm/Kconfig +++ b/drivers/gpu/drm/simpledrm/Kconfig @@ -16,6 +16,11 @@ config DRM_SIMPLEDRM If fbdev support is enabled, this driver will also provide an fbdev compatibility layer.
+ WARNING + fbdev must be enabled for simpledrm to disable itself when a real + hw-driver is probed. It relies on remove_conflicting_framebuffers() + to be called by the hw-driver. + If unsure, say Y.
To compile this driver as a module, choose M here: the diff --git a/drivers/gpu/drm/simpledrm/Makefile b/drivers/gpu/drm/simpledrm/Makefile index 7087245..4b4bcdd 100644 --- a/drivers/gpu/drm/simpledrm/Makefile +++ b/drivers/gpu/drm/simpledrm/Makefile @@ -1,5 +1,5 @@ simpledrm-y := simpledrm_drv.o simpledrm_kms.o simpledrm_gem.o \ simpledrm_damage.o -simpledrm-$(CONFIG_DRM_FBDEV_EMULATION) += simpledrm_fbdev.o +simpledrm-$(CONFIG_FB) += simpledrm_fbdev.o
obj-$(CONFIG_DRM_SIMPLEDRM) := simpledrm.o diff --git a/drivers/gpu/drm/simpledrm/simpledrm.h b/drivers/gpu/drm/simpledrm/simpledrm.h index eb18d59..16f7e03 100644 --- a/drivers/gpu/drm/simpledrm/simpledrm.h +++ b/drivers/gpu/drm/simpledrm/simpledrm.h @@ -100,6 +100,8 @@ struct sdrm_framebuffer { void sdrm_fbdev_init(struct sdrm_device *sdrm); void sdrm_fbdev_cleanup(struct sdrm_device *sdrm); void sdrm_fbdev_set_suspend(struct sdrm_device *sdrm, int state); +void sdrm_fbdev_kickout_init(void); +void sdrm_fbdev_kickout_exit(void);
#else
@@ -115,6 +117,13 @@ static inline void sdrm_fbdev_set_suspend(struct sdrm_device *sdrm, int state) { }
+static inline void sdrm_fbdev_kickout_init(void) +{ +} + +static inline void sdrm_fbdev_kickout_exit(void) +{ +} #endif
#endif /* SDRM_DRV_H */ diff --git a/drivers/gpu/drm/simpledrm/simpledrm_drv.c b/drivers/gpu/drm/simpledrm/simpledrm_drv.c index 88ad717c..a329e4c 100644 --- a/drivers/gpu/drm/simpledrm/simpledrm_drv.c +++ b/drivers/gpu/drm/simpledrm/simpledrm_drv.c @@ -526,12 +526,15 @@ static int __init sdrm_init(void) } }
+ sdrm_fbdev_kickout_init(); + return 0; } module_init(sdrm_init);
static void __exit sdrm_exit(void) { + sdrm_fbdev_kickout_exit(); platform_driver_unregister(&sdrm_simplefb_driver); } module_exit(sdrm_exit); diff --git a/drivers/gpu/drm/simpledrm/simpledrm_fbdev.c b/drivers/gpu/drm/simpledrm/simpledrm_fbdev.c index b83646b..0d64352 100644 --- a/drivers/gpu/drm/simpledrm/simpledrm_fbdev.c +++ b/drivers/gpu/drm/simpledrm/simpledrm_fbdev.c @@ -24,6 +24,7 @@ #include "simpledrm.h"
struct sdrm_fbdev { + struct sdrm_device *sdrm; u32 palette[16]; };
@@ -76,7 +77,16 @@ void sdrm_fbdev_init(struct sdrm_device *sdrm) if (!info) goto err_out;
+ info->apertures = alloc_apertures(1); + if (!info->apertures) + goto err_free; + + info->apertures->ranges[0].base = sdrm->fb_base; + info->apertures->ranges[0].size = sdrm->fb_size; + fb = info->par; + fb->sdrm = sdrm; + info->flags = FBINFO_DEFAULT | FBINFO_MISC_FIRMWARE | FBINFO_CAN_FORCE_OUTPUT; info->pseudo_palette = fb->palette; @@ -158,3 +168,33 @@ void sdrm_fbdev_set_suspend(struct sdrm_device *sdrm, int state) fb_set_suspend(sdrm->fbdev, state); console_unlock(); } + +static int sdrm_fbdev_event_notify(struct notifier_block *self, + unsigned long action, void *data) +{ + struct fb_event *event = data; + struct fb_info *info = event->info; + struct sdrm_fbdev *sfb = info->par; + + if (sfb && sfb->sdrm && sfb->sdrm->fbdev == info && + action == FB_EVENT_FB_UNREGISTERED) { + sfb->sdrm->fbdev = NULL; /* don't run sdrm_fbdev_cleanup() */ + platform_device_del(sfb->sdrm->ddev->platformdev); + } + + return NOTIFY_DONE; +} + +static struct notifier_block sdrm_fbdev_event_notifier = { + .notifier_call = sdrm_fbdev_event_notify, +}; + +void sdrm_fbdev_kickout_init(void) +{ + fb_register_client(&sdrm_fbdev_event_notifier); +} + +void sdrm_fbdev_kickout_exit(void) +{ + fb_unregister_client(&sdrm_fbdev_event_notifier); +}