summaryrefslogtreecommitdiff
path: root/src/lib/ecore_drm2/ecore_drm2_device.c
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-06-09 14:20:05 -0400
committerChris Michael <cp.michael@samsung.com>2017-06-09 14:20:05 -0400
commitbbd18510d690cfc02c20e36850a0aea75fd4e4a0 (patch)
tree78b703385c87acc9d2c61e726fd806090f0443e0 /src/lib/ecore_drm2/ecore_drm2_device.c
parentde12621c900177b99fd05684f2e101cea9e628f3 (diff)
ecore-drm2: Remove #ifdef HAVE_ATOMIC_DRM
As we now use static_libs/libdrm for compiling ecore-drm2, we can remove the atomic #ifdefs as we can run-time check this now. Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/lib/ecore_drm2/ecore_drm2_device.c')
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_device.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/ecore_drm2/ecore_drm2_device.c b/src/lib/ecore_drm2/ecore_drm2_device.c
index 9cc8c37046..bc3eca0d0d 100644
--- a/src/lib/ecore_drm2/ecore_drm2_device.c
+++ b/src/lib/ecore_drm2/ecore_drm2_device.c
@@ -4,9 +4,7 @@
4# define DRM_CAP_DUMB_PREFER_SHADOW 0x4 4# define DRM_CAP_DUMB_PREFER_SHADOW 0x4
5#endif 5#endif
6 6
7#ifdef HAVE_ATOMIC_DRM 7#include <sys/utsname.h>
8# include <sys/utsname.h>
9#endif
10 8
11Eina_Bool _ecore_drm2_use_atomic = EINA_TRUE; 9Eina_Bool _ecore_drm2_use_atomic = EINA_TRUE;
12 10
@@ -143,7 +141,6 @@ out:
143 return ret; 141 return ret;
144} 142}
145 143
146#ifdef HAVE_ATOMIC_DRM
147# if 0 144# if 0
148static Eina_Bool 145static Eina_Bool
149_drm2_atomic_usable(int fd) 146_drm2_atomic_usable(int fd)
@@ -187,7 +184,6 @@ _drm2_atomic_usable(int fd)
187 return ret; 184 return ret;
188} 185}
189# endif 186# endif
190#endif
191 187
192static void 188static void
193_drm2_atomic_state_crtc_fill(Ecore_Drm2_Crtc_State *cstate, int fd) 189_drm2_atomic_state_crtc_fill(Ecore_Drm2_Crtc_State *cstate, int fd)
@@ -614,15 +610,15 @@ ecore_drm2_device_open(Ecore_Drm2_Device *device)
614 DBG("Device Path: %s", device->path); 610 DBG("Device Path: %s", device->path);
615 DBG("Device Fd: %d", device->fd); 611 DBG("Device Fd: %d", device->fd);
616 612
617#ifdef HAVE_ATOMIC_DRM
618# if 0 613# if 0
619 /* check that this system can do atomic */ 614 /* check that this system can do atomic */
620 _ecore_drm2_use_atomic = _drm2_atomic_usable(device->fd); 615 _ecore_drm2_use_atomic = _drm2_atomic_usable(device->fd);
621# endif 616# endif
617
622 if (getenv("ECORE_DRM2_ATOMIC_DISABLE")) 618 if (getenv("ECORE_DRM2_ATOMIC_DISABLE"))
623 _ecore_drm2_use_atomic = EINA_FALSE; 619 _ecore_drm2_use_atomic = EINA_FALSE;
620
624 if (_ecore_drm2_use_atomic) 621 if (_ecore_drm2_use_atomic)
625#endif
626 { 622 {
627 if (sym_drmSetClientCap(device->fd, 623 if (sym_drmSetClientCap(device->fd,
628 DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) < 0) 624 DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) < 0)