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

Commit b8d181e4 authored by Philipp Zabel's avatar Philipp Zabel Committed by Greg Kroah-Hartman
Browse files

staging: drm/imx: add drm plane support 



This patch adds support for a drm overlay plane on DI0 using the DP.
In principle, the overlay plane could also be used on DI1, but to switch
the overlay plane between display interfaces, the base planes would have
to be exchanged transparently while both display interfaces are inactive.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ee4d7fe

drivers/staging/imx-drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,4 +8,4 @@ obj-$(CONFIG_DRM_IMX_TVE) += imx-tve.o 
obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o

obj-$(CONFIG_DRM_IMX_FB_HELPER) += imx-fbdev.o

obj-$(CONFIG_DRM_IMX_IPUV3_CORE) += ipu-v3/

obj-$(CONFIG_DRM_IMX_IPUV3)	+= ipuv3-crtc.o
 
obj-$(CONFIG_DRM_IMX_IPUV3)	+= ipuv3-crtc.o ipuv3-plane.o

drivers/staging/imx-drm/TODO

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ TODO: 


Missing features (not necessarily for moving out of staging):



- Add KMS plane support for CRTC driver

- Add i.MX6 HDMI support

- Add support for IC (Image converter)

- Add support for CSI (CMOS Sensor interface)

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

+5 −0
Original line number Diff line number Diff line
@@ -68,6 +68,11 @@ struct imx_drm_connector { 
	struct module				*owner;

};



int imx_drm_crtc_id(struct imx_drm_crtc *crtc)

{

	return crtc->pipe;

}



static void imx_drm_driver_lastclose(struct drm_device *drm)

{

	struct imx_drm_device *imxdrm = drm->dev_private;

drivers/staging/imx-drm/imx-drm.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ struct drm_fbdev_cma; 
struct drm_framebuffer;

struct platform_device;



int imx_drm_crtc_id(struct imx_drm_crtc *crtc);



struct imx_drm_crtc_helper_funcs {

	int (*enable_vblank)(struct drm_crtc *crtc);

	void (*disable_vblank)(struct drm_crtc *crtc);

drivers/staging/imx-drm/ipu-v3/ipu-common.c

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ static const struct ipu_platform_reg client_reg[] = { 
			.dc = 5,

			.dp = IPU_DP_FLOW_SYNC_BG,

			.dma[0] = IPUV3_CHANNEL_MEM_BG_SYNC,

			.dma[1] = -EINVAL,

			.dma[1] = IPUV3_CHANNEL_MEM_FG_SYNC,

		},

		.name = "imx-ipuv3-crtc",

	}, {