hwc: remove exynos_hwc_window_set_zpos api

Change-Id: Icdcb465869443c6f8e4c13cce1256e0fba48c647

diff --git a/src/tdm_exynos.c b/src/tdm_exynos.c
index 291a75285f1e1c0b720df50809e8f96175cfaec5..753da3d0da8eff13762d01e965e686fe0a6262b5 100644 (file)
--- a/src/tdm_exynos.c
+++ b/src/tdm_exynos.c
@@ -326,7 +326,6 @@ tdm_exynos_init(tdm_display *dpy, tdm_error *error)
                exynos_func_hwc_window.hwc_window_set_composition_type = exynos_hwc_window_set_composition_type;
                exynos_func_hwc_window.hwc_window_set_info = exynos_hwc_window_set_info;
                exynos_func_hwc_window.hwc_window_set_buffer_damage = exynos_hwc_window_set_buffer_damage;
-               exynos_func_hwc_window.hwc_window_set_zpos = exynos_hwc_window_set_zpos;
                exynos_func_hwc_window.hwc_window_set_flags = exynos_hwc_window_set_flags;
                exynos_func_hwc_window.hwc_window_unset_flags = exynos_hwc_window_unset_flags;
                exynos_func_hwc_window.hwc_window_video_get_capability = exynos_hwc_window_video_get_capability;

diff --git a/src/tdm_exynos.h b/src/tdm_exynos.h
index 4ea4b76803665f3c83137fb0a4430da2fec95928..15b0eec0131c3664fc8cec8de22db5d116bbc9a4 100644 (file)
--- a/src/tdm_exynos.h
+++ b/src/tdm_exynos.h
@@ -77,7 +77,6 @@ tdm_error    exynos_layer_get_info(tdm_layer *layer, tdm_info_layer *info);
 tdm_error    exynos_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer);
 tbm_surface_queue_h exynos_hwc_window_get_tbm_buffer_queue(tdm_hwc_window *hwc_window, tdm_error *error);
 tdm_error    exynos_layer_unset_buffer(tdm_layer *layer);
-tdm_error    exynos_hwc_window_set_zpos(tdm_hwc_window *hwc_window, int32_t zpos);
 tdm_error    exynos_hwc_window_set_composition_type(tdm_hwc_window *hwc_window,
                                                                                                tdm_hwc_window_composition composition_type);
 tdm_error    exynos_hwc_window_set_buffer_damage(tdm_hwc_window *hwc_window, tdm_hwc_region damage);

diff --git a/src/tdm_exynos_output.c b/src/tdm_exynos_output.c
index a73895a2749d5e7360bd72dcbbf0967722d7bc67..b99974f2f0ef783227fb6d8ecdfe1eb654d793c9 100644 (file)
--- a/src/tdm_exynos_output.c
+++ b/src/tdm_exynos_output.c
@@ -1274,24 +1274,6 @@ exynos_output_set_status_handler(tdm_output *output,
        return TDM_ERROR_NONE;
 }
 
-tdm_error
-tdm_exynos_output_insert_hwc_window(tdm_exynos_output_data *output, tdm_exynos_hwc_window_data *hwc_window_data)
-{
-       tdm_exynos_hwc_window_data *item = NULL;
-
-       LIST_FOR_EACH_ENTRY_REV(item, &output->hwc_window_list, link) {
-               if (item == hwc_window_data)
-                       return TDM_ERROR_OPERATION_FAILED;
-
-               if (item->zpos <= hwc_window_data->zpos)
-                       break;
-       }
-
-       LIST_INSERT_AFTER(&item->link, &hwc_window_data->link);
-
-       return TDM_ERROR_NONE;
-}
-
 int
 _exynos_output_get_changed_number(tdm_exynos_output_data *output_data)
 {
@@ -1344,7 +1326,6 @@ _exynos_output_hwc_window_create(tdm_output *output, tdm_hwc_window_info *info,
        hwc_window_data->assigned_layer_zpos = -1;
 
        hwc_window_data->output_data = output;
-       hwc_window_data->zpos = 0;
 
        if (info)
                memcpy(&hwc_window_data->info, info, sizeof(tdm_hwc_window_info));
@@ -1369,7 +1350,7 @@ exynos_output_hwc_window_create(tdm_output *output, tdm_error *error)
        if (hwc_window_data == NULL)
                return NULL;
 
-       tdm_exynos_output_insert_hwc_window(output_data, hwc_window_data);
+    LIST_ADDTAIL(&hwc_window_data->link, &output_data->hwc_window_list);
 
        TDM_DBG("hwc_window_data(%p) create", hwc_window_data);
        if (error)
@@ -1704,7 +1685,6 @@ exynos_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h buf
                                                                        tdm_hwc_region damage)
 {
        tdm_exynos_output_data *output_data = output;
-       tdm_exynos_hwc_window_data *hwc_window_data = NULL;
        tdm_error err;
 
        RETURN_VAL_IF_FAIL(output_data != NULL, TDM_ERROR_INVALID_PARAMETER);
@@ -1740,7 +1720,7 @@ exynos_output_hwc_create_video_window(tdm_output *output, tdm_error *error)
        if (hwc_window_data == NULL)
                return NULL;
 
-       tdm_exynos_output_insert_hwc_window(output_data, hwc_window_data);
+    LIST_ADDTAIL(&hwc_window_data->link, &output_data->hwc_window_list);
 
        output_data->video_hwc_window = hwc_window_data;
 

diff --git a/src/tdm_exynos_output.h b/src/tdm_exynos_output.h
index 5889c4eaa61216bfb9e5bc72bed52092ec27a02a..195f15f52ea367d248676773bf9e7c5a742ad199 100644 (file)
--- a/src/tdm_exynos_output.h
+++ b/src/tdm_exynos_output.h
@@ -10,7 +10,4 @@ tdm_error
 tdm_exynos_output_update_status(tdm_exynos_output_data *output_data,
                                                                                tdm_output_conn_status status);
 
-tdm_error
-tdm_exynos_output_insert_hwc_window(tdm_exynos_output_data *output, tdm_exynos_hwc_window_data *hwc_window_data);
-
 #endif /* _TDM_EXYNOS_OUTPUT_H_ */

diff --git a/src/tdm_exynos_types.h b/src/tdm_exynos_types.h
index b8d44c9b5519b72d23aa66105f44815855f3903d..ba83d0762ab144ab4d04950811c08ba03c6704fc 100644 (file)
--- a/src/tdm_exynos_types.h
+++ b/src/tdm_exynos_types.h
@@ -188,8 +188,6 @@ struct _tdm_exynos_hwc_window_data {
        tdm_exynos_output_data *output_data;
 
        /* not fixed data below */
-       int zpos;
-
        tdm_hwc_window_info info;
        int info_changed;
 

diff --git a/src/tdm_exynos_window.c b/src/tdm_exynos_window.c
index 3023e02c2eccc645d480ba75f09c780db75ba07b..e1a8d83727d4805401e0592410e5b7e98a487911 100644 (file)
--- a/src/tdm_exynos_window.c
+++ b/src/tdm_exynos_window.c
@@ -41,33 +41,6 @@ exynos_hwc_window_get_tbm_buffer_queue(tdm_hwc_window *hwc_window, tdm_error *er
 
 }
 
-tdm_error
-exynos_hwc_window_set_zpos(tdm_hwc_window *hwc_window, int32_t zpos)
-{
-       tdm_exynos_hwc_window_data *hwc_window_data = hwc_window;
-       tdm_exynos_output_data *output_data;
-
-       RETURN_VAL_IF_FAIL(hwc_window_data != NULL, TDM_ERROR_INVALID_PARAMETER);
-       RETURN_VAL_IF_FAIL(zpos < 256, TDM_ERROR_INVALID_PARAMETER);
-
-       output_data = hwc_window_data->output_data;
-       RETURN_VAL_IF_FAIL(output_data != NULL, TDM_ERROR_INVALID_PARAMETER);
-
-       if (hwc_window_data->zpos == zpos)
-               return TDM_ERROR_NONE;
-
-       LIST_DEL(&hwc_window_data->link);
-
-       hwc_window_data->zpos = zpos;
-
-       tdm_exynos_output_insert_hwc_window(output_data, hwc_window_data);
-
-       output_data->need_validate = 1;
-
-       return TDM_ERROR_NONE;
-
-}
-
 tdm_error
 exynos_hwc_window_set_composition_type(tdm_hwc_window *hwc_window,
                                                                        tdm_hwc_window_composition comp_type)