hwc: change the exynos_output_set_client_target_buffer api

Change-Id: I401fc26d5cb9ed51194c06fc1e71ce0324198a67

diff --git a/src/tdm_exynos.h b/src/tdm_exynos.h
index b97671c6152c2a76b2f158aaeb65d6e7b4e5d427..4ea4b76803665f3c83137fb0a4430da2fec95928 100644 (file)
--- a/src/tdm_exynos.h
+++ b/src/tdm_exynos.h
@@ -66,9 +66,7 @@ tdm_error    exynos_output_hwc_get_changed_composition_types(tdm_output *output,
                                                                                 tdm_hwc_window_composition *composition_types);
 tdm_error    exynos_output_hwc_accept_changes(tdm_output *output);
 tbm_surface_queue_h exynos_output_hwc_get_target_buffer_queue(tdm_output *output, tdm_error *error);
-tdm_error    exynos_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h buffer,
-                                                                       tdm_hwc_region damage, tdm_hwc_window **composited_wnds,
-                                                                       uint32_t num_wnds);
+tdm_error    exynos_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h buffer, tdm_hwc_region damage);
 tdm_error    exynos_output_hwc_get_video_supported_formats(tdm_output *output, const tbm_format **formats, int *count);
 tdm_hwc_window *exynos_output_hwc_create_video_window(tdm_output *output, tdm_error *error);
 tdm_error    exynos_layer_get_capability(tdm_layer *layer, tdm_caps_layer *caps);

diff --git a/src/tdm_exynos_output.c b/src/tdm_exynos_output.c
index bc22a1cb81f1cff7895df1d76e90334cecd8fd05..a73895a2749d5e7360bd72dcbbf0967722d7bc67 100644 (file)
--- a/src/tdm_exynos_output.c
+++ b/src/tdm_exynos_output.c
@@ -1342,7 +1342,6 @@ _exynos_output_hwc_window_create(tdm_output *output, tdm_hwc_window_info *info,
        hwc_window_data->client_type = TDM_COMPOSITION_NONE;
        hwc_window_data->validated_type = -1;
        hwc_window_data->assigned_layer_zpos = -1;
-       hwc_window_data->present_on_target_wnd = 0;
 
        hwc_window_data->output_data = output;
        hwc_window_data->zpos = 0;
@@ -1702,11 +1701,9 @@ exynos_output_hwc_get_target_buffer_queue(tdm_output *output, tdm_error *error)
 
 tdm_error
 exynos_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h buffer,
-                                                                       tdm_hwc_region damage, tdm_hwc_window **composited_wnds,
-                                                                       uint32_t num_wnds)
+                                                                       tdm_hwc_region damage)
 {
        tdm_exynos_output_data *output_data = output;
-       tdm_exynos_hwc_window_data **composited_list = NULL;
        tdm_exynos_hwc_window_data *hwc_window_data = NULL;
        tdm_error err;
 
@@ -1719,26 +1716,6 @@ exynos_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h buf
        err = exynos_hwc_window_set_buffer_damage(output_data->target_hwc_window, damage);
        RETURN_VAL_IF_FAIL(err == TDM_ERROR_NONE, err);
 
-       /* TODO: sergs: think about it
-        * a hack to allow the e-boot-animation to be shown */
-       if (!composited_wnds || !num_wnds)
-               return TDM_ERROR_NONE;
-
-       /* to keep a list up to date with one provided by e20 */
-       LIST_FOR_EACH_ENTRY(hwc_window_data, &output_data->hwc_window_list, link)
-               hwc_window_data->present_on_target_wnd = 0;
-
-       composited_list = (tdm_exynos_hwc_window_data**)composited_wnds;
-
-       for (uint32_t i = 0; i < num_wnds; i++)
-               composited_list[i]->present_on_target_wnd = 1;
-
-       LIST_FOR_EACH_ENTRY(hwc_window_data, &output_data->hwc_window_list, link)
-               if (hwc_window_data->present_on_target_wnd) {
-                       TDM_INFO("hwc_wnd:%p validated_type: %p presents on the target window.",
-                                       hwc_window_data, _comp_to_str(hwc_window_data->validated_type));
-               }
-
        return TDM_ERROR_NONE;
 }
 

diff --git a/src/tdm_exynos_types.h b/src/tdm_exynos_types.h
index 9c1516ca14d4c60debf6b2b9e9dae592a608663b..b8d44c9b5519b72d23aa66105f44815855f3903d 100644 (file)
--- a/src/tdm_exynos_types.h
+++ b/src/tdm_exynos_types.h
@@ -207,8 +207,6 @@ struct _tdm_exynos_hwc_window_data {
        int assigned_layer_zpos;
 
        tdm_hwc_window_flag flags;
-
-       int present_on_target_wnd;
 };
 
 struct _tdm_exynos_display_buffer {

diff --git a/src/tdm_exynos_window.c b/src/tdm_exynos_window.c
index 979721e883cca75e33d4900b2c26e8de263ce99f..3023e02c2eccc645d480ba75f09c780db75ba07b 100644 (file)
--- a/src/tdm_exynos_window.c
+++ b/src/tdm_exynos_window.c
@@ -90,7 +90,6 @@ exynos_hwc_window_set_composition_type(tdm_hwc_window *hwc_window,
                hwc_window_data->validated_type = -1;
                hwc_window_data->candidate_layer_zpos = -1;
                hwc_window_data->assigned_layer_zpos = -1;
-               hwc_window_data->present_on_target_wnd = 0;
        }
 
        output_data->need_validate = 1;