Commit c162215f authored by Stefan Agner's avatar Stefan Agner

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: default avatarStefan Agner <stefan@agner.ch>
parent 238e4f44
...@@ -3,6 +3,5 @@ fsl-dcu-drm-y := fsl_dcu_drm_drv.o \ ...@@ -3,6 +3,5 @@ fsl-dcu-drm-y := fsl_dcu_drm_drv.o \
fsl_dcu_drm_rgb.o \ fsl_dcu_drm_rgb.o \
fsl_dcu_drm_plane.o \ fsl_dcu_drm_plane.o \
fsl_dcu_drm_crtc.o \ fsl_dcu_drm_crtc.o \
fsl_dcu_drm_fbdev.o \
fsl_tcon.o fsl_tcon.o
obj-$(CONFIG_DRM_FSL_DCU) += fsl-dcu-drm.o obj-$(CONFIG_DRM_FSL_DCU) += fsl-dcu-drm.o
...@@ -87,7 +87,7 @@ static int fsl_dcu_load(struct drm_device *dev, unsigned long flags) ...@@ -87,7 +87,7 @@ static int fsl_dcu_load(struct drm_device *dev, unsigned long flags)
goto done; goto done;
dev->irq_enabled = true; dev->irq_enabled = true;
fsl_dcu_fbdev_init(dev); fsl_dev->fbdev = drm_fbdev_cma_init(dev, 24, 1, 1);
return 0; return 0;
done: done:
......
...@@ -197,7 +197,6 @@ struct fsl_dcu_drm_device { ...@@ -197,7 +197,6 @@ struct fsl_dcu_drm_device {
struct drm_atomic_state *state; 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); int fsl_dcu_drm_modeset_init(struct fsl_dcu_drm_device *fsl_dev);
#endif /* __FSL_DCU_DRM_DRV_H__ */ #endif /* __FSL_DCU_DRM_DRV_H__ */
/*
* 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);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment