[EGIT] [core/efl] master 01/01: evas/drm: Remove evas-drm handling of the drm fd

[Stefan Schmidt]

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=96b767ef775301a00a7983324a5db3f2c56b7304

commit 96b767ef775301a00a7983324a5db3f2c56b7304
Author: Stefan Schmidt <s.schm...@samsung.com>
Date:   Mon Sep 8 13:22:20 2014 +0200

    evas/drm: Remove evas-drm handling of the drm fd
    
    We now longer have a use case for opening the drm file descriptor in the 
evas
    engine itself. This is now all handled in ecore_drm or ecore evas.
---
 src/modules/evas/engines/drm/Evas_Engine_Drm.h |  1 -
 src/modules/evas/engines/drm/evas_engine.c     | 34 --------------------------
 2 files changed, 35 deletions(-)

diff --git a/src/modules/evas/engines/drm/Evas_Engine_Drm.h 
b/src/modules/evas/engines/drm/Evas_Engine_Drm.h
index b67440e..f40ec87 100644
--- a/src/modules/evas/engines/drm/Evas_Engine_Drm.h
+++ b/src/modules/evas/engines/drm/Evas_Engine_Drm.h
@@ -20,7 +20,6 @@ struct _Evas_Engine_Info_Drm
         Eina_Bool vsync : 1;
 
         int fd;
-        Eina_Bool own_fd : 1;
 
         int output;
         int plane;
diff --git a/src/modules/evas/engines/drm/evas_engine.c 
b/src/modules/evas/engines/drm/evas_engine.c
index 34fd3af..e44ba6c 100644
--- a/src/modules/evas/engines/drm/evas_engine.c
+++ b/src/modules/evas/engines/drm/evas_engine.c
@@ -26,24 +26,6 @@ _output_setup(Evas_Engine_Info_Drm *info, int w, int h)
    Render_Engine *re = NULL;
    Outbuf *ob;
 
-   /* if we have no drm device, get one */
-   if (info->info.fd < 0)
-     {
-        if (!ecore_drm_init()) return NULL;
-
-        /* try getting the default drm device */
-        if (!(info->info.dev = ecore_drm_device_find(NULL, NULL)))
-          goto on_error;
-
-        /* check if we already opened the drm device with ecore_evas */
-        /* try to open the drm ourselfs (most likely because we get called 
from expedite) */
-        if (!ecore_drm_device_open(info->info.dev))
-          goto on_error;
-
-        info->info.own_fd = EINA_TRUE;
-        info->info.fd = ecore_drm_device_fd_get(info->info.dev);
-     }
-
    /* try to allocate space for our render engine structure */
    if (!(re = calloc(1, sizeof(Render_Engine))))
      goto on_error;
@@ -70,14 +52,6 @@ _output_setup(Evas_Engine_Info_Drm *info, int w, int h)
  on_error:
    if (re) evas_render_engine_software_generic_clean(&re->generic);
 
-   /* check if we already opened the card. if so, close it */
-   if ((info->info.fd >= 0) && (info->info.own_fd))
-     {
-        ecore_drm_device_close(info->info.dev);
-        info->info.fd = -1;
-        ecore_drm_device_free(info->info.dev);
-     }
-
    free(re);
    return NULL;
 }
@@ -185,14 +159,6 @@ eng_output_free(void *data)
 {
    Render_Engine *re = data;
 
-   /* check if we already opened the card. if so, close it */
-   if ((re->info->info.fd >= 0) && (re->info->info.own_fd))
-     {
-        ecore_drm_device_close(re->info->info.dev);
-        re->info->info.fd = -1;
-        ecore_drm_device_free(re->info->info.dev);
-     }
-
    evas_render_engine_software_generic_clean(&re->generic);
    free(re);
 

--