aboutsummaryrefslogtreecommitdiffstats
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
parentecore_drm2: Add ecore_drm2_fb_dmabuf_import (diff)
downloadefl-554883c048269cc8f3940c56a5f1bbdefd94555c.tar.gz
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 @@
# include <sys/utsname.h>
#endif
-Eina_Bool _ecore_drm2_use_atomic = EINA_FALSE;
+Eina_Bool _ecore_drm2_use_atomic = EINA_TRUE;
static Eina_Bool
_cb_session_active(void *data, int type EINA_UNUSED, void *event)
@@ -154,6 +154,8 @@ out:
}
#ifdef HAVE_ATOMIC_DRM
+
+# if 0
static Eina_Bool
_drm2_atomic_usable(int fd)
{
@@ -195,6 +197,7 @@ _drm2_atomic_usable(int fd)
return ret;
}
+# endif
static void
_drm2_atomic_state_crtc_fill(Ecore_Drm2_Crtc_State *cstate, int fd)
@@ -615,9 +618,11 @@ ecore_drm2_device_open(Ecore_Drm2_Device *device)
DBG("Device Fd: %d", device->fd);
#ifdef HAVE_ATOMIC_DRM
+# if 0
/* check that this system can do atomic */
_ecore_drm2_use_atomic = _drm2_atomic_usable(device->fd);
if (_ecore_drm2_use_atomic)
+# endif
{
if (sym_drmSetClientCap(device->fd, DRM_CLIENT_CAP_ATOMIC, 1) < 0)
{
@@ -628,7 +633,10 @@ ecore_drm2_device_open(Ecore_Drm2_Device *device)
{
if (sym_drmSetClientCap(device->fd,
DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) < 0)
- WRN("Could not enable Universal Plane support");
+ {
+ WRN("Could not enable Universal Plane support");
+ _ecore_drm2_use_atomic = EINA_FALSE;
+ }
else
{
/* atomic & planes are usable */