Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1df8b530 authored by Russell King's avatar Russell King
Browse files

imx-drm: remove imx-fb.c 



imx-fb.c doesn't need to be separate from imx-drm-core.c - all it is
doing is setting up the minimum and maximum sizes of the scanout
buffers, and setting up the mode_config function pointers.  Move the
contents into imx-drm-core.c and kill this file.

Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8acba02f

drivers/staging/imx-drm/Makefile

+1 −1
Original line number Diff line number Diff line 


imxdrm-objs := imx-drm-core.o imx-fb.o

imxdrm-objs := imx-drm-core.o



obj-$(CONFIG_DRM_IMX) += imxdrm.o

drivers/staging/imx-drm/imx-drm-core.c

+15 −1
Original line number Diff line number Diff line
@@ -381,6 +381,10 @@ static void imx_drm_connector_unregister( 
	drm_mode_group_reinit(imxdrm->drm);

}



static struct drm_mode_config_funcs imx_drm_mode_config_funcs = {

	.fb_create = drm_fb_cma_create,

};



/*

 * Main DRM initialisation. This binds, initialises and registers

 * with DRM the subcomponents of the driver.
@@ -406,8 +410,18 @@ static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags) 
	 */

	drm->irq_enabled = true;



	/*

	 * set max width and height as default value(4096x4096).

	 * this value would be used to check framebuffer size limitation

	 * at drm_mode_addfb().

	 */

	drm->mode_config.min_width = 64;

	drm->mode_config.min_height = 64;

	drm->mode_config.max_width = 4096;

	drm->mode_config.max_height = 4096;

	drm->mode_config.funcs = &imx_drm_mode_config_funcs;



	drm_mode_config_init(drm);

	imx_drm_mode_config_init(drm);



	mutex_lock(&imxdrm->mutex);

drivers/staging/imx-drm/imx-fb.c

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
/*

 * i.MX drm driver

 *

 * Copyright (C) 2012 Sascha Hauer, Pengutronix

 *

 * Based on Samsung Exynos code

 *

 * Copyright (c) 2011 Samsung Electronics Co., Ltd.

 *

 * 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.

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */

#include <linux/module.h>

#include <drm/drmP.h>

#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_fb_cma_helper.h>



#include "imx-drm.h"



static struct drm_mode_config_funcs imx_drm_mode_config_funcs = {

	.fb_create = drm_fb_cma_create,

};



void imx_drm_mode_config_init(struct drm_device *dev)

{

	dev->mode_config.min_width = 64;

	dev->mode_config.min_height = 64;



	/*

	 * set max width and height as default value(4096x4096).

	 * this value would be used to check framebuffer size limitation

	 * at drm_mode_addfb().

	 */

	dev->mode_config.max_width = 4096;

	dev->mode_config.max_height = 4096;



	dev->mode_config.funcs = &imx_drm_mode_config_funcs;

}