hwc: modify the tdm symbols

tdm api and some enumeration vaules change

Change-Id: Ifc105599cae7ea38d849c0165ad7507f98631ff4

diff --git a/src/tdm_sprd.c b/src/tdm_sprd.c
index 5b7ef33..017e0dd 100644 (file)
--- a/src/tdm_sprd.c
+++ b/src/tdm_sprd.c
@@ -187,7 +187,7 @@ tdm_sprd_init(tdm_display *dpy, tdm_error *error)
                sprd_func_hwc.hwc_set_client_target_buffer = sprd_hwc_set_client_target_buffer;
                sprd_func_hwc.hwc_validate = sprd_hwc_validate;
                sprd_func_hwc.hwc_get_changed_composition_types = sprd_hwc_get_changed_composition_types;
-               sprd_func_hwc.hwc_accept_changes = sprd_hwc_accept_changes;
+               sprd_func_hwc.hwc_accept_validation = sprd_hwc_accept_validation;
                sprd_func_hwc.hwc_commit = sprd_hwc_commit;
                sprd_func_hwc.hwc_set_commit_handler = sprd_hwc_set_commit_handler;
 

diff --git a/src/tdm_sprd.h b/src/tdm_sprd.h
index e20b527..debb8ab 100644 (file)
--- a/src/tdm_sprd.h
+++ b/src/tdm_sprd.h
@@ -64,7 +64,7 @@ tbm_surface_queue_h sprd_hwc_get_client_target_buffer_queue(tdm_hwc *hwc, tdm_er
 tdm_error           sprd_hwc_set_client_target_buffer(tdm_hwc *hwc, tbm_surface_h buffer, tdm_region damage);
 tdm_error           sprd_hwc_validate(tdm_hwc *hwc, tdm_hwc_window **composited_wnds, uint32_t num_wnds, uint32_t *num_types);
 tdm_error           sprd_hwc_get_changed_composition_types(tdm_hwc *hwc, uint32_t *num_elements, tdm_hwc_window **hwc_window, tdm_hwc_window_composition *composition_types);
-tdm_error           sprd_hwc_accept_changes(tdm_hwc *hwc);
+tdm_error           sprd_hwc_accept_validation(tdm_hwc *hwc);
 tdm_error           sprd_hwc_commit(tdm_hwc *hwc, int sync, void *user_data);
 tdm_error           sprd_hwc_set_commit_handler(tdm_hwc *hwc, tdm_hwc_commit_handler func);
 

diff --git a/src/tdm_sprd_hwc.c b/src/tdm_sprd_hwc.c
index c16bd5d..40c3889 100644 (file)
--- a/src/tdm_sprd_hwc.c
+++ b/src/tdm_sprd_hwc.c
@@ -133,7 +133,7 @@ _sprd_get_number_of_visible_windows(tdm_sprd_hwc_data *hwc_data)
        RETURN_VAL_IF_FAIL(hwc_data, 0);
 
        LIST_FOR_EACH_ENTRY(window, &hwc_data->hwc_window_list, link) {
-               if (window->validated_type == TDM_COMPOSITION_NONE)
+               if (window->validated_type == TDM_HWC_WIN_COMPOSITION_NONE)
                        continue;
 
                number++;
@@ -164,10 +164,10 @@ _sprd_hwc_prepare_commit(tdm_sprd_hwc_data *hwc_data)
 
        /* set hwc windows */
        LIST_FOR_EACH_ENTRY_REV(hwc_window_data, &hwc_data->hwc_window_list, link) {
-               if (hwc_window_data->validated_type == TDM_COMPOSITION_DEVICE) {
+               if (hwc_window_data->validated_type == TDM_HWC_WIN_COMPOSITION_DEVICE) {
                        layer = _sprd_output_get_layer(output_data, 1);
                        osd_use = 1;
-               } else if (hwc_window_data->validated_type == TDM_COMPOSITION_VIDEO) {
+               } else if (hwc_window_data->validated_type == TDM_HWC_WIN_COMPOSITION_VIDEO) {
                        layer = _sprd_output_get_layer(output_data, 0);
                        img_use = 1;
                } else {
@@ -198,7 +198,7 @@ _sprd_output_get_changed_number(tdm_sprd_hwc_data *hwc_data)
        tdm_sprd_hwc_window_data *hwc_window_data = NULL;
 
        LIST_FOR_EACH_ENTRY(hwc_window_data, &hwc_data->hwc_window_list, link) {
-               if (hwc_window_data->client_type == TDM_COMPOSITION_NONE)
+               if (hwc_window_data->client_type == TDM_HWC_WIN_COMPOSITION_NONE)
                        continue;
 
                if (hwc_window_data->client_type != hwc_window_data->validated_type)
@@ -355,77 +355,77 @@ sprd_hwc_validate(tdm_hwc *hwc, tdm_hwc_window **composited_wnds, uint32_t num_w
 
        /* initialize the validated_types */
        LIST_FOR_EACH_ENTRY_REV(hwc_window_data, &hwc_data->hwc_window_list, link) {
-               if (hwc_window_data->validated_type == TDM_COMPOSITION_NONE)
+               if (hwc_window_data->validated_type == TDM_HWC_WIN_COMPOSITION_NONE)
                        continue;
 
-               hwc_window_data->validated_type = TDM_COMPOSITION_NONE;
+               hwc_window_data->validated_type = TDM_HWC_WIN_COMPOSITION_NONE;
        }
 
        if (num_wnds == 0) {
                hwc_data->need_target_window = 1;
        } else if (num_wnds == 1) {
-               composited_list[0]->constraints = TDM_CONSTRAINT_NONE;
-               if (composited_list[0]->client_type == TDM_COMPOSITION_DEVICE) {
+               composited_list[0]->constraints = TDM_HWC_WIN_CONSTRAINT_NONE;
+               if (composited_list[0]->client_type == TDM_HWC_WIN_COMPOSITION_DEVICE) {
                        if (_sprd_can_set_hwc_window_on_hw_layer(composited_list[0])) {
                                hwc_data->need_target_window = 0;
-                               composited_list[0]->validated_type = TDM_COMPOSITION_DEVICE;
+                               composited_list[0]->validated_type = TDM_HWC_WIN_COMPOSITION_DEVICE;
                                composited_list[0]->zpos = zpos;
                                zpos++;
                        } else {
-                               composited_list[0]->validated_type = TDM_COMPOSITION_CLIENT;
+                               composited_list[0]->validated_type = TDM_HWC_WIN_COMPOSITION_CLIENT;
                                composited_list[0]->zpos = -1;
                        }
-                       composited_list[0]->constraints = TDM_CONSTRAINT_BUFFER_QUEUE;
-               } else if (composited_list[0]->client_type == TDM_COMPOSITION_CLIENT) {
-                       composited_list[0]->validated_type = TDM_COMPOSITION_CLIENT;
+                       composited_list[0]->constraints = TDM_HWC_WIN_CONSTRAINT_BUFFER_QUEUE;
+               } else if (composited_list[0]->client_type == TDM_HWC_WIN_COMPOSITION_CLIENT) {
+                       composited_list[0]->validated_type = TDM_HWC_WIN_COMPOSITION_CLIENT;
                        composited_list[0]->zpos = -1;
-               } else if (composited_list[0]->client_type == TDM_COMPOSITION_VIDEO) {
-                       composited_list[0]->validated_type = TDM_COMPOSITION_VIDEO;
+               } else if (composited_list[0]->client_type == TDM_HWC_WIN_COMPOSITION_VIDEO) {
+                       composited_list[0]->validated_type = TDM_HWC_WIN_COMPOSITION_VIDEO;
                        composited_list[0]->zpos = zpos;
                        zpos++;
                } else {
-                       composited_list[0]->validated_type = TDM_COMPOSITION_NONE;
+                       composited_list[0]->validated_type = TDM_HWC_WIN_COMPOSITION_NONE;
                        composited_list[0]->zpos = -1;
                }
        } else {
                int has_video = 0;
 
                for (i = 0; i < num_wnds; i++) {
-                       if (composited_list[i]->client_type == TDM_COMPOSITION_VIDEO)
+                       if (composited_list[i]->client_type == TDM_HWC_WIN_COMPOSITION_VIDEO)
                                has_video++;
                }
 
                for (i = 0 ; i < num_wnds; i++) {
-                       composited_list[i]->constraints = TDM_CONSTRAINT_NONE;
+                       composited_list[i]->constraints = TDM_HWC_WIN_CONSTRAINT_NONE;
                    if (num_wnds == 2 && has_video == 1) {
-                               if (composited_list[i]->client_type == TDM_COMPOSITION_DEVICE) {
+                               if (composited_list[i]->client_type == TDM_HWC_WIN_COMPOSITION_DEVICE) {
                                        if (_sprd_can_set_hwc_window_on_hw_layer(composited_list[i])) {
                                                hwc_data->need_target_window = 0;
-                                               composited_list[i]->validated_type = TDM_COMPOSITION_DEVICE;
+                                               composited_list[i]->validated_type = TDM_HWC_WIN_COMPOSITION_DEVICE;
                                                composited_list[i]->zpos = zpos;
                                                zpos++;
                                        } else {
-                                               composited_list[0]->validated_type = TDM_COMPOSITION_CLIENT;
+                                               composited_list[0]->validated_type = TDM_HWC_WIN_COMPOSITION_CLIENT;
                                                composited_list[0]->zpos = -1;
                                        }
-                               } else if (composited_list[i]->client_type == TDM_COMPOSITION_CLIENT) {
-                                       composited_list[i]->validated_type = TDM_COMPOSITION_CLIENT;
+                               } else if (composited_list[i]->client_type == TDM_HWC_WIN_COMPOSITION_CLIENT) {
+                                       composited_list[i]->validated_type = TDM_HWC_WIN_COMPOSITION_CLIENT;
                                        composited_list[i]->zpos = -1;
-                               } else if (composited_list[i]->client_type == TDM_COMPOSITION_VIDEO) {
-                                       composited_list[i]->validated_type = TDM_COMPOSITION_VIDEO;
+                               } else if (composited_list[i]->client_type == TDM_HWC_WIN_COMPOSITION_VIDEO) {
+                                       composited_list[i]->validated_type = TDM_HWC_WIN_COMPOSITION_VIDEO;
                                        composited_list[i]->zpos = zpos;
                                        zpos++;
                                } else {
-                                       composited_list[i]->validated_type = TDM_COMPOSITION_NONE;
+                                       composited_list[i]->validated_type = TDM_HWC_WIN_COMPOSITION_NONE;
                                        composited_list[i]->zpos = -1;
                                }
                        } else {
-                               if (composited_list[i]->client_type == TDM_COMPOSITION_DEVICE ||
-                                       composited_list[i]->client_type == TDM_COMPOSITION_CLIENT) {
-                                       composited_list[i]->validated_type = TDM_COMPOSITION_CLIENT;
+                               if (composited_list[i]->client_type == TDM_HWC_WIN_COMPOSITION_DEVICE ||
+                                       composited_list[i]->client_type == TDM_HWC_WIN_COMPOSITION_CLIENT) {
+                                       composited_list[i]->validated_type = TDM_HWC_WIN_COMPOSITION_CLIENT;
                                        composited_list[i]->zpos = -1;
-                               } else if (composited_list[i]->client_type == TDM_COMPOSITION_NONE) {
-                                       composited_list[i]->validated_type = TDM_COMPOSITION_NONE;
+                               } else if (composited_list[i]->client_type == TDM_HWC_WIN_COMPOSITION_NONE) {
+                                       composited_list[i]->validated_type = TDM_HWC_WIN_COMPOSITION_NONE;
                                        composited_list[i]->zpos = -1;
                                }
                        }
@@ -454,7 +454,7 @@ sprd_hwc_get_changed_composition_types(tdm_hwc *hwc, uint32_t *num_elements,
        }
 
        LIST_FOR_EACH_ENTRY_REV(hwc_window_data, &hwc_data->hwc_window_list, link) {
-               if (hwc_window_data->client_type == TDM_COMPOSITION_NONE)
+               if (hwc_window_data->client_type == TDM_HWC_WIN_COMPOSITION_NONE)
                        continue;
 
                if (num >= *num_elements)
@@ -474,7 +474,7 @@ sprd_hwc_get_changed_composition_types(tdm_hwc *hwc, uint32_t *num_elements,
 }
 
 tdm_error
-sprd_hwc_accept_changes(tdm_hwc *hwc)
+sprd_hwc_accept_validation(tdm_hwc *hwc)
 {
        tdm_sprd_hwc_data *hwc_data = hwc;
        tdm_error ret = TDM_ERROR_NONE;

diff --git a/src/tdm_sprd_hwc_window.c b/src/tdm_sprd_hwc_window.c
index 2607be7..2e98aff 100644 (file)
--- a/src/tdm_sprd_hwc_window.c
+++ b/src/tdm_sprd_hwc_window.c
@@ -8,13 +8,13 @@
 static const char *
 _sprd_comp_to_str(tdm_hwc_window_composition composition_type)
 {
-       if (composition_type == TDM_COMPOSITION_CLIENT)
+       if (composition_type == TDM_HWC_WIN_COMPOSITION_CLIENT)
                return "CLIENT";
-       else if (composition_type == TDM_COMPOSITION_DEVICE)
+       else if (composition_type == TDM_HWC_WIN_COMPOSITION_DEVICE)
                return "DEVICE";
-       else if (composition_type == TDM_COMPOSITION_CURSOR)
+       else if (composition_type == TDM_HWC_WIN_COMPOSITION_CURSOR)
                return "CURSOR";
-       else if (composition_type == TDM_COMPOSITION_NONE)
+       else if (composition_type == TDM_HWC_WIN_COMPOSITION_NONE)
                return "NONE";
 
        return "unknown";