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

Commit 39b9004d authored by Philipp Zabel's avatar Philipp Zabel
Browse files

gpu: ipu-v3: Move i.MX IPUv3 core driver out of staging 



The i.MX Image Processing Unit (IPU) contains a number of image processing
blocks that sit right in the middle between DRM and V4L2. Some of the modules,
such as Display Controller, Processor, and Interface (DC, DP, DI) or CMOS
Sensor Interface (CSI) and their FIFOs could be assigned to either framework,
but others, such as the dma controller (IDMAC) and image converter (IC) can
be used by both.
The IPUv3 core driver provides an internal API to access the modules, to be
used by both DRM and V4L2 IPUv3 drivers.

Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d1db0eea

drivers/gpu/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-y			+= drm/ vga/

obj-$(CONFIG_TEGRA_HOST1X)	+= host1x/

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

drivers/gpu/ipu-v3/Kconfig

0 → 100644
+7 −0
Original line number Diff line number Diff line 
config IMX_IPUV3_CORE

	tristate "IPUv3 core support"

	depends on SOC_IMX5 || SOC_IMX6Q || SOC_IMX6SL || ARCH_MULTIPLATFORM

	depends on RESET_CONTROLLER

	help

	  Choose this if you have a i.MX5/6 system and want to use the Image

	  Processing Unit. This option only enables IPU base support.

drivers/staging/imx-drm/ipu-v3/Makefile→drivers/gpu/ipu-v3/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_DRM_IMX_IPUV3_CORE) += imx-ipu-v3.o

obj-$(CONFIG_IMX_IPUV3_CORE) += imx-ipu-v3.o



imx-ipu-v3-objs := ipu-common.o ipu-dc.o ipu-di.o ipu-dp.o ipu-dmfc.o

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


#include <drm/drm_fourcc.h>



#include "imx-ipu-v3.h"

#include <video/imx-ipu-v3.h>

#include "ipu-prv.h"



static inline u32 ipu_cm_read(struct ipu_soc *ipu, unsigned offset)

drivers/staging/imx-drm/ipu-v3/ipu-dc.c→drivers/gpu/ipu-v3/ipu-dc.c

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
#include <linux/delay.h>

#include <linux/io.h>



#include "../imx-drm.h"

#include "imx-ipu-v3.h"

#include <video/imx-ipu-v3.h>

#include "ipu-prv.h"



#define DC_MAP_CONF_PTR(n)	(0x108 + ((n) & ~0x1) * 2)