summaryrefslogtreecommitdiff
path: root/src/lib/ecore_drm2/ecore_drm2_device.c
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-03-23 11:52:15 -0400
committerChris Michael <cp.michael@samsung.com>2017-04-18 07:55:10 -0400
commit554883c048269cc8f3940c56a5f1bbdefd94555c (patch)
treeddbd05169010113fdd31ed736bcf6cee93838adb /src/lib/ecore_drm2/ecore_drm2_device.c
parent61f40d58f7e87b2c937884cae4e2fd59f9a60882 (diff)
ecore-drm2: Disable driver whitelist tests
While having the ability to test for specific driver and kernel versions is nice to ensure that Atomic is supported, it quickly can get out of hand trying to maintain this whitelist so (for now) disable it and rely on the kernel results from drmSetCap. @fix 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.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/ecore_drm2/ecore_drm2_device.c b/src/lib/ecore_drm2/ecore_drm2_device.c
index 0c5cb15254..03f21d8238 100644
--- a/src/lib/ecore_drm2/ecore_drm2_device.c
+++ b/src/lib/ecore_drm2/ecore_drm2_device.c
@@ -16,7 +16,7 @@
16# include <sys/utsname.h> 16# include <sys/utsname.h>
17#endif 17#endif
18 18
19Eina_Bool _ecore_drm2_use_atomic = EINA_FALSE; 19Eina_Bool _ecore_drm2_use_atomic = EINA_TRUE;
20 20
21static Eina_Bool 21static Eina_Bool
22_cb_session_active(void *data, int type EINA_UNUSED, void *event) 22_cb_session_active(void *data, int type EINA_UNUSED, void *event)
@@ -154,6 +154,8 @@ out:
154} 154}
155 155
156#ifdef HAVE_ATOMIC_DRM 156#ifdef HAVE_ATOMIC_DRM
157
158# if 0
157static Eina_Bool 159static Eina_Bool
158_drm2_atomic_usable(int fd) 160_drm2_atomic_usable(int fd)
159{ 161{
@@ -195,6 +197,7 @@ _drm2_atomic_usable(int fd)
195 197
196 return ret; 198 return ret;
197} 199}
200# endif
198 201
199static void 202static void
200_drm2_atomic_state_crtc_fill(Ecore_Drm2_Crtc_State *cstate, int fd) 203_drm2_atomic_state_crtc_fill(Ecore_Drm2_Crtc_State *cstate, int fd)
@@ -615,9 +618,11 @@ ecore_drm2_device_open(Ecore_Drm2_Device *device)
615 DBG("Device Fd: %d", device->fd); 618 DBG("Device Fd: %d", device->fd);
616 619
617#ifdef HAVE_ATOMIC_DRM 620#ifdef HAVE_ATOMIC_DRM
621# if 0
618 /* check that this system can do atomic */ 622 /* check that this system can do atomic */
619 _ecore_drm2_use_atomic = _drm2_atomic_usable(device->fd); 623 _ecore_drm2_use_atomic = _drm2_atomic_usable(device->fd);
620 if (_ecore_drm2_use_atomic) 624 if (_ecore_drm2_use_atomic)
625# endif
621 { 626 {
622 if (sym_drmSetClientCap(device->fd, DRM_CLIENT_CAP_ATOMIC, 1) < 0) 627 if (sym_drmSetClientCap(device->fd, DRM_CLIENT_CAP_ATOMIC, 1) < 0)
623 { 628 {
@@ -628,7 +633,10 @@ ecore_drm2_device_open(Ecore_Drm2_Device *device)
628 { 633 {
629 if (sym_drmSetClientCap(device->fd, 634 if (sym_drmSetClientCap(device->fd,
630 DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) < 0) 635 DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) < 0)
631 WRN("Could not enable Universal Plane support"); 636 {
637 WRN("Could not enable Universal Plane support");
638 _ecore_drm2_use_atomic = EINA_FALSE;
639 }
632 else 640 else
633 { 641 {
634 /* atomic & planes are usable */ 642 /* atomic & planes are usable */