aboutsummaryrefslogtreecommitdiff
path: root/libdce.c
diff options
context:
space:
mode:
authorSathishkumar <x0203598@ti.com>2013-08-28 18:43:59 +0530
committerSaurabh Bipin Chandra <a0131926@ti.com>2013-08-29 14:38:17 +0530
commit30c8b47648b5ff316519e7054b9caa7131878ab6 (patch)
tree9629eb810252a204a4068a86848b2846cc4b3209 /libdce.c
parent90deab3291a4cf18f2bb3df18da0678fd27ac467 (diff)
downloaddce-30c8b47648b5ff316519e7054b9caa7131878ab6.tar.gz
[LINUX] X11 and Wayland Support removed
X11 and wayland support is removed from libdce. Defaults to omapdrm device. Change-Id: I0def0c872cc2658edd12a3e69dec6016eab3f1c9 Signed-off-by: Sathishkumar <x0203598@ti.com>
Diffstat (limited to 'libdce.c')
-rw-r--r--libdce.c33
1 files changed, 3 insertions, 30 deletions
diff --git a/libdce.c b/libdce.c
index fc507c6..11ee333 100644
--- a/libdce.c
+++ b/libdce.c
@@ -88,14 +88,6 @@
#if defined(BUILDOS_LINUX)
-#ifdef HAVE_X11
-// Defined from configure.ac
-extern int dce_auth_x11(int *fd);
-#endif /* HAVE_X11 */
-#ifdef HAVE_WAYLAND // Defined from configure.ac
-extern int dce_auth_wayland(int *fd);
-#endif /* HAVE_WAYLAND */
-
int fd = -1;
struct omap_device *dev = 0;
uint32_t dce_debug = 3;
@@ -181,28 +173,9 @@ static int dce_init(void)
#if defined(BUILDOS_LINUX)
/* Open omapdrm device */
- int authenticated = 0;
-
-#ifdef HAVE_X11
- /*If X11 server is running*/
- if( !authenticated ) {
- int ret = dce_auth_x11(&fd);
- if( !ret ) {
- authenticated = 1;
- }
- }
-#endif
-#ifdef HAVE_WAYLAND
- /*If Wayland windowing is supported*/
- if( !authenticated ) {
- int ret = dce_auth_wayland(&fd);
- if( !ret ) {
- authenticated = 1;
- }
- }
-#endif
- if((fd == -1) && !authenticated ) {
- printf("no X11/wayland, fallback to opening DRM device directly\n");
+
+ if(fd == -1) {
+ printf("Open omapdrm device \n");
fd = drmOpen("omapdrm", "platform:omapdrm:00");
}
if( fd >= 0 ) {