[RFC v2 8/8] drm/vc4: Test generic fbdev emulation

Noralf Trønnes
2018-01-03T22:21:10Z

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
---
drivers/gpu/drm/vc4/vc4_drv.c | 3 ---
drivers/gpu/drm/vc4/vc4_kms.c | 3 +--
2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index ceb385fd69c5..ef8a2d3a6d1f 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -152,7 +152,6 @@ static struct drm_driver vc4_drm_driver = {
DRIVER_HAVE_IRQ |
DRIVER_RENDER |
DRIVER_PRIME),
- .lastclose = drm_fb_helper_lastclose,
.irq_handler = vc4_irq,
.irq_preinstall = vc4_irq_preinstall,
.irq_postinstall = vc4_irq_postinstall,
@@ -297,8 +296,6 @@ static void vc4_drm_unbind(struct device *dev)

drm_dev_unregister(drm);

- drm_fb_cma_fbdev_fini(drm);
-
drm_mode_config_cleanup(drm);

drm_dev_unref(drm);
diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index 4256f294c346..671c62f1b4d3 100644
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -188,7 +188,6 @@ static struct drm_framebuffer *vc4_fb_create(struct drm_device *dev,
}

static const struct drm_mode_config_funcs vc4_mode_funcs = {
- .output_poll_changed = drm_fb_helper_output_poll_changed,
.atomic_check = drm_atomic_helper_check,
.atomic_commit = vc4_atomic_commit,
.fb_create = vc4_fb_create,
@@ -219,7 +218,7 @@ int vc4_kms_load(struct drm_device *dev)
drm_mode_config_reset(dev);

if (dev->mode_config.num_connector)
- drm_fb_cma_fbdev_init(dev, 32, 0);
+ drm_fb_helper_generic_fbdev_setup(dev, 32, 0);

drm_kms_helper_poll_init(dev);

--
2.14.2