register omapdrm to the platform so that we get working frambuffer and X working
This commit is contained in:
Dennis Gilmore
parent
85ce09f074
commit
0c2c60f6fb
|
|
@ -0,0 +1,173 @@
|
|||
Register OMAP DRM/KMS platform device. DMM is split into a
|
||||
separate device using hwmod.
|
||||
|
||||
Signed-off-by: Andy Gross <andy.gr...@ti.com>
|
||||
---
|
||||
arch/arm/mach-omap2/Makefile | 4 ++
|
||||
arch/arm/mach-omap2/drm.c | 61 ++++++++++++++++++++++++++++++++
|
||||
drivers/staging/omapdrm/omap_drv.h | 2 +-
|
||||
drivers/staging/omapdrm/omap_priv.h | 55 ----------------------------
|
||||
include/linux/platform_data/omap_drm.h | 52 +++++++++++++++++++++++++++
|
||||
5 files changed, 118 insertions(+), 56 deletions(-)
|
||||
create mode 100644 arch/arm/mach-omap2/drm.c
|
||||
delete mode 100644 drivers/staging/omapdrm/omap_priv.h
|
||||
create mode 100644 include/linux/platform_data/omap_drm.h
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
|
||||
index 49f92bc..c301ab7 100644
|
||||
--- a/arch/arm/mach-omap2/Makefile
|
||||
+++ b/arch/arm/mach-omap2/Makefile
|
||||
@@ -187,6 +187,10 @@
|
||||
obj-y += dsp.o
|
||||
endif
|
||||
|
||||
+ifneq ($(CONFIG_DRM_OMAP),)
|
||||
+obj-y += drm.o
|
||||
+endif
|
||||
+
|
||||
# Specific board support
|
||||
obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o
|
||||
obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o
|
||||
diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c
|
||||
new file mode 100644
|
||||
index 0000000..72e0f01b
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-omap2/drm.c
|
||||
@@ -0,0 +1,61 @@
|
||||
+/*
|
||||
+ * DRM/KMS device registration for TI OMAP platforms
|
||||
+ *
|
||||
+ * Copyright (C) 2012 Texas Instruments
|
||||
+ * Author: Rob Clark <rob.cl...@linaro.org>
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License version 2 as published by
|
||||
+ * the Free Software Foundation.
|
||||
+ *
|
||||
+ * 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.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License along with
|
||||
+ * this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+ */
|
||||
+
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/mm.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/dma-mapping.h>
|
||||
+
|
||||
+#include <plat/omap_device.h>
|
||||
+#include <plat/omap_hwmod.h>
|
||||
+
|
||||
+#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
|
||||
+
|
||||
+static struct platform_device omap_drm_device = {
|
||||
+ .dev = {
|
||||
+ .coherent_dma_mask = DMA_BIT_MASK(32),
|
||||
+ },
|
||||
+ .name = "omapdrm",
|
||||
+ .id = 0,
|
||||
+};
|
||||
+
|
||||
+static int __init omap_init_drm(void)
|
||||
+{
|
||||
+ struct omap_hwmod *oh = NULL;
|
||||
+ struct platform_device *pdev;
|
||||
+
|
||||
+ /* lookup and populate the DMM information, if present - OMAP4+ */
|
||||
+ oh = omap_hwmod_lookup("dmm");
|
||||
+
|
||||
+ if (oh) {
|
||||
+ pdev = omap_device_build(oh->name, -1, oh, NULL, 0, NULL, 0,
|
||||
+ false);
|
||||
+ WARN(IS_ERR(pdev), "Could not build omap_device for %s\n",
|
||||
+ oh->name);
|
||||
+ }
|
||||
+
|
||||
+ return platform_device_register(&omap_drm_device);
|
||||
+
|
||||
+}
|
||||
+
|
||||
+arch_initcall(omap_init_drm);
|
||||
+
|
||||
+#endif
|
||||
diff --git a/drivers/staging/omapdrm/omap_drv.h
|
||||
b/drivers/staging/omapdrm/omap_drv.h
|
||||
index b7e0f07..96296e0 100644
|
||||
--- a/drivers/staging/omapdrm/omap_drv.h
|
||||
+++ b/drivers/staging/omapdrm/omap_drv.h
|
||||
@@ -25,8 +25,8 @@
|
||||
#include <linux/types.h>
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_crtc_helper.h>
|
||||
+#include <linux/platform_data/omap_drm.h>
|
||||
#include "omap_drm.h"
|
||||
-#include "omap_priv.h"
|
||||
|
||||
#define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)
|
||||
#define VERB(fmt, ...) if (0) DRM_DEBUG(fmt, ##__VA_ARGS__) /* verbose debug */
|
||||
diff --git a/include/linux/platform_data/omap_drm.h
|
||||
b/include/linux/platform_data/omap_drm.h
|
||||
new file mode 100644
|
||||
index 0000000..3da73bd
|
||||
--- /dev/null
|
||||
+++ b/include/linux/platform_data/omap_drm.h
|
||||
@@ -0,0 +1,52 @@
|
||||
+/*
|
||||
+ * DRM/KMS platform data for TI OMAP platforms
|
||||
+ *
|
||||
+ * Copyright (C) 2012 Texas Instruments
|
||||
+ * Author: Rob Clark <rob.cl...@linaro.org>
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License version 2 as published by
|
||||
+ * the Free Software Foundation.
|
||||
+ *
|
||||
+ * 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.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License along with
|
||||
+ * this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+ */
|
||||
+
|
||||
+#ifndef __PLATFORM_DATA_OMAP_DRM_H__
|
||||
+#define __PLATFORM_DATA_OMAP_DRM_H__
|
||||
+
|
||||
+/*
|
||||
+ * Optional platform data to configure the default configuration of which
|
||||
+ * pipes/overlays/CRTCs are used.. if this is not provided, then instead the
|
||||
+ * first CONFIG_DRM_OMAP_NUM_CRTCS are used, and they are each connected to
|
||||
+ * one manager, with priority given to managers that are connected to
|
||||
+ * detected devices. Remaining overlays are used as video planes. This
|
||||
+ * should be a good default behavior for most cases, but yet there still
|
||||
+ * might be times when you wish to do something different.
|
||||
+ */
|
||||
+struct omap_kms_platform_data {
|
||||
+ /* overlays to use as CRTCs: */
|
||||
+ int ovl_cnt;
|
||||
+ const int *ovl_ids;
|
||||
+
|
||||
+ /* overlays to use as video planes: */
|
||||
+ int pln_cnt;
|
||||
+ const int *pln_ids;
|
||||
+
|
||||
+ int mgr_cnt;
|
||||
+ const int *mgr_ids;
|
||||
+
|
||||
+ int dev_cnt;
|
||||
+ const char **dev_names;
|
||||
+};
|
||||
+
|
||||
+struct omap_drm_platform_data {
|
||||
+ struct omap_kms_platform_data *kms_pdata;
|
||||
+};
|
||||
+
|
||||
+#endif /* __PLATFORM_DATA_OMAP_DRM_H__ */
|
||||
--
|
||||
1.7.5.4
|
||||
|
|
@ -713,6 +713,8 @@ Patch19000: ips-noirq.patch
|
|||
# Flattened devicetree support
|
||||
Patch21000: arm-omap-dt-compat.patch
|
||||
Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
|
||||
# drm register derived from http://www.digipedia.pl/usenet/thread/19013/36923/
|
||||
Patch21002: arm-omap-drm-register.patch
|
||||
|
||||
# ARM tegra
|
||||
Patch21004: arm-tegra-nvec-kconfig.patch
|
||||
|
|
@ -1325,6 +1327,7 @@ ApplyPatch taint-vbox.patch
|
|||
ApplyPatch arm-tegra-nvec-kconfig.patch
|
||||
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
|
||||
ApplyPatch arm-beagle-usb-init.patch
|
||||
ApplyPAtch arm-omap-drm-register.patch
|
||||
|
||||
#
|
||||
# bugfixes to drivers and filesystems
|
||||
|
|
@ -2330,6 +2333,10 @@ fi
|
|||
# '-' | |
|
||||
# '-'
|
||||
%changelog
|
||||
* Tue Jun 05 2012 Dennis Gilmore <dennis@ausil.us>
|
||||
- add patch to register omapdrm to the platforms so that we get
|
||||
- working console framebuffer and X on panda and beagle boards
|
||||
|
||||
* Tue Jun 5 2012 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||
- Update ARM config options for 3.4
|
||||
- Enable MTD/UBI/JFFS2 on ARM platforms
|
||||
|
|
|
|||
Loading…
Reference in New Issue