Revert "[hwc] make a temp fix related to ecore_drm"

This reverts commit 4fda527798b22e59d36ba38e8aad601144734b1b.

Change-Id: I4445b85894201e3c899bed120c282a96cc9381cc
Signed-off-by: Konstantin Drabeniuk <k.drabeniuk@samsung.com>

diff --git a/src/tdm_layer.c b/src/tdm_layer.c
index f4def3585b826231c41333dafee9f0340330e6e9..cb4ef55e532f6a049939ae61a694edd62b273e7e 100644 (file)
--- a/src/tdm_layer.c
+++ b/src/tdm_layer.c
@@ -86,23 +86,6 @@ static void _tdm_layer_reset_pending_data(tdm_private_layer *private_layer);
 EXTERN tdm_error
 tdm_layer_get_capabilities(tdm_layer *layer, tdm_layer_capability *capabilities)
 {
-       int hwc_enable;
-       char *str;
-
-       hwc_enable = 0;
-       str = getenv("TDM_HWC");
-
-       if (str)
-               hwc_enable = strtol(str, NULL, 10);
-
-       /* an ecore_drm related fix: sorry... when ecore_drm refuses to use
-        * tdm_layer we'll remove this code */
-       if (hwc_enable) {
-               if (capabilities)
-                       *capabilities = TDM_LAYER_CAPABILITY_PRIMARY;
-               return TDM_ERROR_NONE;
-       }
-
        LAYER_FUNC_ENTRY();
 
        TDM_RETURN_VAL_IF_FAIL(capabilities != NULL, TDM_ERROR_INVALID_PARAMETER);

diff --git a/src/tdm_output.c b/src/tdm_output.c
index a923a6326b5c3a842fef9863da4ea3177cc66f32..e58bd48b57a2c9b3de6a8f05f675df6e1e59a380 100644 (file)
--- a/src/tdm_output.c
+++ b/src/tdm_output.c
@@ -299,13 +299,7 @@ tdm_output_get_layer_count(tdm_output *output, int *count)
        _pthread_mutex_lock(&private_display->lock);
 
        if (private_display->hwc_enable) {
-
-               /* an ecore_drm related fix: sorry... when ecore_drm refuses to use
-               * tdm_layer we'll remove this code */
-               if (count)
-                       *count = 1;
-               //*count = 0;
-
+               *count = 0;
                _pthread_mutex_unlock(&private_display->lock);
                return TDM_ERROR_NONE;
        }
@@ -340,11 +334,7 @@ tdm_output_get_layer(tdm_output *output, int index, tdm_error *error)
                _pthread_mutex_unlock(&private_display->lock);
                if (error)
                        *error = TDM_ERROR_INVALID_PARAMETER;
-
-               /* an ecore_drm related fix: sorry... when ecore_drm refuses to use tdm_layer
-                * we'll remove this code */
-               return (tdm_layer *)0xffffffffffffffff;
-               //return NULL;
+               return NULL;
        }
 
        LIST_FOR_EACH_ENTRY(private_layer, &private_output->layer_list, link) {