Skip to content

Commit

Permalink
imx-drm: remove imx-fb.c
Browse files Browse the repository at this point in the history
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: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Feb 24, 2014
1 parent 8acba02 commit 1df8b53
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 49 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/imx-drm/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

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

obj-$(CONFIG_DRM_IMX) += imxdrm.o

Expand Down
16 changes: 15 additions & 1 deletion drivers/staging/imx-drm/imx-drm-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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);

Expand Down
47 changes: 0 additions & 47 deletions drivers/staging/imx-drm/imx-fb.c

This file was deleted.

0 comments on commit 1df8b53

Please sign in to comment.