aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSathishkumar2013-08-28 08:13:59 -0500
committerSaurabh Bipin Chandra2013-08-29 04:08:17 -0500
commit30c8b47648b5ff316519e7054b9caa7131878ab6 (patch)
tree9629eb810252a204a4068a86848b2846cc4b3209 /libdce.c
parent90deab3291a4cf18f2bb3df18da0678fd27ac467 (diff)
downloadrepo-libdce-30c8b47648b5ff316519e7054b9caa7131878ab6.tar.gz
repo-libdce-30c8b47648b5ff316519e7054b9caa7131878ab6.tar.xz
repo-libdce-30c8b47648b5ff316519e7054b9caa7131878ab6.zip
[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 @@
88 88
89 89
90#if defined(BUILDOS_LINUX) 90#if defined(BUILDOS_LINUX)
91#ifdef HAVE_X11
92// Defined from configure.ac
93extern int dce_auth_x11(int *fd);
94#endif /* HAVE_X11 */
95#ifdef HAVE_WAYLAND // Defined from configure.ac
96extern int dce_auth_wayland(int *fd);
97#endif /* HAVE_WAYLAND */
98
99int fd = -1; 91int fd = -1;
100struct omap_device *dev = 0; 92struct omap_device *dev = 0;
101uint32_t dce_debug = 3; 93uint32_t dce_debug = 3;
@@ -181,28 +173,9 @@ static int dce_init(void)
181 173
182#if defined(BUILDOS_LINUX) 174#if defined(BUILDOS_LINUX)
183 /* Open omapdrm device */ 175 /* Open omapdrm device */
184 int authenticated = 0; 176
185 177 if(fd == -1) {
186#ifdef HAVE_X11 178 printf("Open omapdrm device \n");
187 /*If X11 server is running*/
188 if( !authenticated ) {
189 int ret = dce_auth_x11(&fd);
190 if( !ret ) {
191 authenticated = 1;
192 }
193 }
194#endif
195#ifdef HAVE_WAYLAND
196 /*If Wayland windowing is supported*/
197 if( !authenticated ) {
198 int ret = dce_auth_wayland(&fd);
199 if( !ret ) {
200 authenticated = 1;
201 }
202 }
203#endif
204 if((fd == -1) && !authenticated ) {
205 printf("no X11/wayland, fallback to opening DRM device directly\n");
206 fd = drmOpen("omapdrm", "platform:omapdrm:00"); 179 fd = drmOpen("omapdrm", "platform:omapdrm:00");
207 } 180 }
208 if( fd >= 0 ) { 181 if( fd >= 0 ) {