drm/fsl-dcu: remove separate compilation unit for fbdev emulation

The separate file fsl_dcu_drm_fbdev.c only initialized fbdev
emulation which is a one-line operation. There is not much more
code on sight which justifies a separate file, hence call the
initialization helper directly from the drv file.

Signed-off-by: Stefan Agner <stefan@agner.ch>

diff --git a/drivers/gpu/drm/fsl-dcu/Makefile b/drivers/gpu/drm/fsl-dcu/Makefile
index b35a292287f3476a591e8c6647ecca7920f94518..aca34f656beaca8103e0f3df2ed3c74934167158 100644 (file)
--- a/drivers/gpu/drm/fsl-dcu/Makefile
+++ b/drivers/gpu/drm/fsl-dcu/Makefile
@@ -3,6 +3,5 @@ fsl-dcu-drm-y := fsl_dcu_drm_drv.o \
                 fsl_dcu_drm_rgb.o \
                 fsl_dcu_drm_plane.o \
                 fsl_dcu_drm_crtc.o \
-                fsl_dcu_drm_fbdev.o \
                 fsl_tcon.o
 obj-$(CONFIG_DRM_FSL_DCU)      += fsl-dcu-drm.o

diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index f242e64c76ca3a266c7eb1a3c9f51604c4274c10..736451616ce4fa12c4c1410bf7d6ad928a030aed 100644 (file)
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -87,7 +87,7 @@ static int fsl_dcu_load(struct drm_device *dev, unsigned long flags)
                goto done;
        dev->irq_enabled = true;
 
-       fsl_dcu_fbdev_init(dev);
+       fsl_dev->fbdev = drm_fbdev_cma_init(dev, 24, 1, 1);
 
        return 0;
 done:

diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
index 3b371fe7491e164e2f3507f7d8283a677cbdfa11..e9e9aeecf2eb20f4d605f727c0264bdd831145e8 100644 (file)
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
@@ -197,7 +197,6 @@ struct fsl_dcu_drm_device {
        struct drm_atomic_state *state;
 };
 
-void fsl_dcu_fbdev_init(struct drm_device *dev);
 int fsl_dcu_drm_modeset_init(struct fsl_dcu_drm_device *fsl_dev);
 
 #endif /* __FSL_DCU_DRM_DRV_H__ */

diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c
deleted file mode 100644 (file)
index 8b8b819..0000000
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2015 Freescale Semiconductor, Inc.
- *
- * Freescale DCU drm device driver
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <drm/drmP.h>
-#include <drm/drm_fb_cma_helper.h>
-
-#include "fsl_dcu_drm_drv.h"
-
-/* initialize fbdev helper */
-void fsl_dcu_fbdev_init(struct drm_device *dev)
-{
-       struct fsl_dcu_drm_device *fsl_dev = dev_get_drvdata(dev->dev);
-
-       fsl_dev->fbdev = drm_fbdev_cma_init(dev, 24, 1, 1);
-}