diff options
author | Chris Michael <cp.michael@samsung.com> | 2015-11-05 08:59:37 -0500 |
---|---|---|
committer | Chris Michael <cp.michael@samsung.com> | 2015-11-05 09:01:36 -0500 |
commit | ff8b141f87d350c134356c38a924f4eb4fe1ea23 (patch) | |
tree | 7afc55be349b37df2748655e7ede650e5195c8d0 /src/lib/ecore_drm/ecore_drm_device.c | |
parent | ae7a243c99c071a92582fda0a2dfdd27e3a39e1b (diff) |
ecore-drm: Fix issue of hanging in read()
Summary: As we already call drmHandleEvent when we pageflip, we don't
need to be using an fd handler to catch them. This should fix T2791
@fix
Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/lib/ecore_drm/ecore_drm_device.c')
-rw-r--r-- | src/lib/ecore_drm/ecore_drm_device.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/ecore_drm/ecore_drm_device.c b/src/lib/ecore_drm/ecore_drm_device.c index 1e7c5f8edb..128561441b 100644 --- a/src/lib/ecore_drm/ecore_drm_device.c +++ b/src/lib/ecore_drm/ecore_drm_device.c | |||
@@ -340,10 +340,6 @@ ecore_drm_device_open(Ecore_Drm_Device *dev) | |||
340 | eeze_udev_watch_add(EEZE_UDEV_TYPE_DRM, events, | 340 | eeze_udev_watch_add(EEZE_UDEV_TYPE_DRM, events, |
341 | _ecore_drm_device_cb_output_event, dev); | 341 | _ecore_drm_device_cb_output_event, dev); |
342 | 342 | ||
343 | dev->drm.hdlr = | ||
344 | ecore_main_fd_handler_add(dev->drm.fd, ECORE_FD_READ, | ||
345 | _ecore_drm_device_cb_event, dev, NULL, NULL); | ||
346 | |||
347 | /* dev->drm.idler = */ | 343 | /* dev->drm.idler = */ |
348 | /* ecore_idle_enterer_add(_ecore_drm_device_cb_idle, dev); */ | 344 | /* ecore_idle_enterer_add(_ecore_drm_device_cb_idle, dev); */ |
349 | 345 | ||
@@ -362,9 +358,6 @@ ecore_drm_device_close(Ecore_Drm_Device *dev) | |||
362 | /* close xkb context */ | 358 | /* close xkb context */ |
363 | if (dev->xkb_ctx) xkb_context_unref(dev->xkb_ctx); | 359 | if (dev->xkb_ctx) xkb_context_unref(dev->xkb_ctx); |
364 | 360 | ||
365 | if (dev->drm.hdlr) ecore_main_fd_handler_del(dev->drm.hdlr); | ||
366 | dev->drm.hdlr = NULL; | ||
367 | |||
368 | _ecore_drm_launcher_device_close(dev->drm.name, dev->drm.fd); | 361 | _ecore_drm_launcher_device_close(dev->drm.name, dev->drm.fd); |
369 | 362 | ||
370 | /* reset device fd */ | 363 | /* reset device fd */ |