summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHemant Hariyani <hemanthariyani@ti.com>2011-06-10 09:39:33 +0100
committerAndy Green <andy.green@linaro.org>2011-06-10 09:39:33 +0100
commit0073fb5c50220eb5923b7e1d3c6dd5f6b8767921 (patch)
treec46b26f03ac98a6aa9c44d5493653babd22aef25
parent8c66946130321670ce86f2374769f6ec41c282ed (diff)
From 0126387f5c236059224ff69a814877a0e2cf88e1 Mon Sep 17 00:00:00 2001
Subject: [PATCH 5/5] OMAP4: SGX-KM: Enable DRM support in SGX Driver This patch enables DRM support in SGX driver. Change-Id: I346589d12ef685a4b33b56842d86fcf8c5fdc718 Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
-rw-r--r--drivers/gpu/pvr/Makefile10
-rw-r--r--drivers/gpu/pvr/pvr_drm.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/drivers/gpu/pvr/Makefile b/drivers/gpu/pvr/Makefile
index 725688b4666..ac70d350e3f 100644
--- a/drivers/gpu/pvr/Makefile
+++ b/drivers/gpu/pvr/Makefile
@@ -94,6 +94,13 @@ ccflags-$(CONFIG_SGX_PDUMP) += -Idrivers/gpu/pvr/pdump \
-DPDUMP \
-DSUPPORT_DBGDRV_EVENT_OBJECTS
+ccflags-$(CONFIG_DRM) += \
+ -DSUPPORT_DRI_DRM \
+ -DPVR_SECURE_DRM_AUTH_EXPORT \
+ -DPVR_DRI_DRM_PLATFORM_DEV \
+ -DPVR_LDM_PLATFORM_PRE_REGISTERED \
+ -DPVR_DISPLAY_CONTROLLER_DRM_IOCTL
+
pvr_common-y := \
osfunc.o \
mutils.o \
@@ -127,6 +134,9 @@ pvr_common-y := \
mem_debug.o \
osfunc_common.o
+pvr_common-$(CONFIG_DRM) += \
+ pvr_drm.o
+
pvr540-$(CONFIG_SGX540) := \
omap4/sysconfig.o \
omap4/sysutils.o
diff --git a/drivers/gpu/pvr/pvr_drm.c b/drivers/gpu/pvr/pvr_drm.c
index ed5a0ba5681..d75e46215b8 100644
--- a/drivers/gpu/pvr/pvr_drm.c
+++ b/drivers/gpu/pvr/pvr_drm.c
@@ -459,7 +459,7 @@ static void __exit PVRSRVDrmExit(void)
#endif
}
-module_init(PVRSRVDrmInit);
+late_initcall(PVRSRVDrmInit);
module_exit(PVRSRVDrmExit);
#endif
#endif