Revert "ecore_drm: do not allocate the drm_dumb memory"

This reverts commit 802392303aa0c4225d6356e33fe9b287329ff1ad.

Change-Id: I368d7435286336ed77ac8dbf2f071ad12111f5a4

diff --git a/packaging/efl.spec b/packaging/efl.spec
index 200b703..857225a 100644 (file)
--- a/packaging/efl.spec
+++ b/packaging/efl.spec
@@ -1,6 +1,5 @@
 %bcond_with wayland
 %bcond_with x
-%bcond_with emulator
 
 Name:           efl
 Version:        1.16.0
@@ -1029,10 +1028,6 @@ cp %{SOURCE1001} .
 CFLAGS+=" -DMESA_EGL_NO_X11_HEADERS "
 %endif
 
-%if %{with emulator}
-CFLAGS+=" -DEFL_FEATURE_EMULATOR "
-%endif
-
 CFLAGS+=" -DLIBDIR=\\\"%{_libdir}\\\""
 
 %if "%{asan}" == "1"

diff --git a/src/lib/ecore_drm/ecore_drm_fb.c b/src/lib/ecore_drm/ecore_drm_fb.c
index 05046b1..2b6ad2a 100644 (file)
--- a/src/lib/ecore_drm/ecore_drm_fb.c
+++ b/src/lib/ecore_drm/ecore_drm_fb.c
@@ -60,11 +60,6 @@ ecore_drm_fb_create(Ecore_Drm_Device *dev, int width, int height)
    EINA_SAFETY_ON_NULL_RETURN_VAL(dev, NULL);
    EINA_SAFETY_ON_TRUE_RETURN_VAL((width < 1) || (height < 1), NULL);
 
-// ecore_drm_fb creates the Ecore_Drm_Fb from only TDM, not from drm dumb except emulator.
-// emulator supports only drm dumb memory to display the images on the screen.
-#ifndef EFL_FEATURE_EMULATOR
-   return _ecore_drm_display_fb_create(dev, width, height);
-#else
 #ifdef HAVE_TDM
    drmVersionPtr ver = drmGetVersion(ecore_drm_device_fd_get(dev));
    if (ver)
@@ -152,7 +147,6 @@ add_err:
 create_err:
    free(fb);
    return NULL;
-#endif // EFL_FEATURE_EMULATOR
 }
 
 EAPI void