---

yaml --- r: 325447 b: refs/heads/master c: e692da4 h: refs/heads/master i: 325445: 8a01db1 325443: 1a089b4 325439: 60d2a53 v: v3
git-mirror · Sep 21, 2012 · 40730f1 · 40730f1
1 parent cf1f16f
commit 40730f1
Show file tree

Hide file tree

Showing 9 changed files with 1,088 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f34170c762e88512796be7f94df80f294d12de95
+refs/heads/master: e692da4d0e587f549ba101015e5f89903ba20b67
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -140,4 +140,6 @@ source "drivers/staging/silicom/Kconfig"
 
 source "drivers/staging/ced1401/Kconfig"
 
+source "drivers/staging/imx-drm/Kconfig"
+
 endif # STAGING
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -62,3 +62,4 @@ obj-$(CONFIG_OMAP_BANDGAP)	+= omap-thermal/
 obj-$(CONFIG_ZCACHE2)		+= ramster/
 obj-$(CONFIG_NET_VENDOR_SILICOM)	+= silicom/
 obj-$(CONFIG_CED1401)		+= ced1401/
+obj-$(CONFIG_DRM_IMX)		+= imx-drm/
diff --git a/trunk/drivers/staging/imx-drm/Kconfig b/trunk/drivers/staging/imx-drm/Kconfig
@@ -0,0 +1,17 @@
+config DRM_IMX
+	tristate "DRM Support for Freescale i.MX"
+	select DRM_KMS_HELPER
+	select DRM_GEM_CMA_HELPER
+	select DRM_KMS_CMA_HELPER
+	depends on DRM && ARCH_MXC
+	help
+	  enable i.MX graphics support
+
+config DRM_IMX_FB_HELPER
+	tristate "provide legacy framebuffer /dev/fb0"
+	select DRM_KMS_CMA_HELPER
+	depends on DRM_IMX
+	help
+	  The DRM framework can provide a legacy /dev/fb0 framebuffer
+	  for your device. This is necessary to get a framebuffer console
+	  and also for appplications using the legacy framebuffer API
diff --git a/trunk/drivers/staging/imx-drm/Makefile b/trunk/drivers/staging/imx-drm/Makefile
@@ -0,0 +1,6 @@
+
+imxdrm-objs := imx-drm-core.o imx-fb.o
+
+obj-$(CONFIG_DRM_IMX) += imxdrm.o
+
+obj-$(CONFIG_DRM_IMX_FB_HELPER) += imx-fbdev.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -140,4 +140,6 @@ source "drivers/staging/silicom/Kconfig"

		source "drivers/staging/ced1401/Kconfig"

		source "drivers/staging/imx-drm/Kconfig"

		endif # STAGING