remove tdm_helper_drm_fd

Change-Id: I3ccf7031b3b9c90805d8ab8b2e30b6463f20c086

diff --git a/src/tdm_drm.c b/src/tdm_drm.c
index 0f26434..c185842 100644 (file)
--- a/src/tdm_drm.c
+++ b/src/tdm_drm.c
@@ -214,18 +214,7 @@ tdm_drm_init(tdm_display *dpy, tdm_error *error)
 
     drm_data->dpy = dpy;
 
-    /* TODO: tdm_helper_drm_fd is external drm_fd which is opened by ecore_drm.
-     * This is very tricky. But we can't remove tdm_helper_drm_fd now because
-     * ecore_drm doesn't use tdm yet. When we make ecore_drm use tdm,
-     * tdm_helper_drm_fd will be removed.
-     */
-    drm_data->drm_fd = -1;
-    if (tdm_helper_drm_fd >= 0)
-        drm_data->drm_fd = tdm_helper_drm_fd;
-
-    if (drm_data->drm_fd < 0)
-        drm_data->drm_fd = _tdm_drm_open_drm();
-
+    drm_data->drm_fd = _tdm_drm_open_drm();
     if (drm_data->drm_fd < 0)
     {
         ret = TDM_ERROR_OPERATION_FAILED;

diff --git a/src/tdm_drm_display.c b/src/tdm_drm_display.c
index 6eac8a7..face731 100644 (file)
--- a/src/tdm_drm_display.c
+++ b/src/tdm_drm_display.c
@@ -1068,12 +1068,7 @@ drm_output_commit(tdm_output *output, int sync, void *user_data)
         }
     }
 
-    /* TODO: tdm_helper_drm_fd is external drm_fd which is opened by ecore_drm.
-     * This is very tricky. But we can't remove tdm_helper_drm_fd now because
-     * ecore_drm doesn't use tdm yet. When we make ecore_drm use tdm,
-     * tdm_helper_drm_fd will be removed.
-     */
-    if ((tdm_helper_drm_fd == -1) && (do_waitvblank == 1))
+    if (do_waitvblank == 1)
     {
         tdm_drm_event_data *event_data = calloc(1, sizeof(tdm_drm_event_data));
         uint target_msc;