summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoram Park <boram1288.park@samsung.com>2016-02-18 10:35:58 +0900
committerBoram Park <boram1288.park@samsung.com>2016-02-18 10:35:58 +0900
commit88fc903eb001abce82a9ca0f695e10a552a27165 (patch)
treeae780d110100979d640f2e4dd963ce45f39138ea
parentaf6a511625b459bdecf51ebd7c9c4724c50f2180 (diff)
downloadlibtdm-drm-88fc903eb001abce82a9ca0f695e10a552a27165.tar.gz
libtdm-drm-88fc903eb001abce82a9ca0f695e10a552a27165.tar.bz2
libtdm-drm-88fc903eb001abce82a9ca0f695e10a552a27165.zip
remove tdm_helper_drm_fd
Change-Id: I3ccf7031b3b9c90805d8ab8b2e30b6463f20c086
-rw-r--r--src/tdm_drm.c13
-rw-r--r--src/tdm_drm_display.c7
2 files changed, 2 insertions, 18 deletions
diff --git a/src/tdm_drm.c b/src/tdm_drm.c
index 0f26434..c185842 100644
--- 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
--- 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;