From: SooChan Lim <sc1.lim@samsung.com>
Date: Tue, 20 Sep 2016 11:37:33 +0000 (+0900)
Subject: ecore_drm: do not allocate the drm_dumb memory
X-Git-Tag: accepted/tizen/common/20160927.152708~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=802392303aa0c4225d6356e33fe9b287329ff1ad;p=platform%2Fupstream%2Fefl.git

ecore_drm: do not allocate the drm_dumb memory

Change-Id: I9b86d7259b3bd0c7c8e52b91688d785b4d685266
---

diff --git a/packaging/efl.spec b/packaging/efl.spec
index dbcef45..e886827 100755
--- a/packaging/efl.spec
+++ b/packaging/efl.spec
@@ -1,5 +1,6 @@
 %bcond_with wayland
 %bcond_with x
+%bcond_with emulator
 
 Name:           efl
 Version:        1.16.0
@@ -684,6 +685,10 @@ cp %{SOURCE1001} .
 CFLAGS+=" -DMESA_EGL_NO_X11_HEADERS "
 %endif
 
+%if %{with emulator}
+CFLAGS+=" -DEFL_FEATURE_EMULATOR "
+%endif
+
 %reconfigure \
     --with-glib=always \
     --disable-xim \
diff --git a/src/lib/ecore_drm/ecore_drm_fb.c b/src/lib/ecore_drm/ecore_drm_fb.c
index a992562..10a8da6 100644
--- a/src/lib/ecore_drm/ecore_drm_fb.c
+++ b/src/lib/ecore_drm/ecore_drm_fb.c
@@ -65,6 +65,11 @@ 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)
@@ -148,6 +153,7 @@ add_err:
 create_err:
    free(fb);
    return NULL;
+#endif // EFL_FEATURE_EMULATOR
 }
 
 EAPI void