hwc: fix the TDM_COMPOSITION to TDM_HWC_WIN_COMOPSITION

Change-Id: Ibf5db3ea7c2118b3487212b0e2994207c27b5c14

diff --git a/src/tdm_sprd_hwc.c b/src/tdm_sprd_hwc.c
index d10292739a36ca7de70a333ff9c19ea320b648bf..539e1a8dd08e0f61c974f37118ac52ada26eaa87 100644 (file)
--- a/src/tdm_sprd_hwc.c
+++ b/src/tdm_sprd_hwc.c
@@ -174,8 +174,8 @@ _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_NONE ||
-                   hwc_window_data->validated_type == TDM_COMPOSITION_CLIENT)
+               if (hwc_window_data->validated_type == TDM_HWC_WIN_COMPOSITION_NONE ||
+                   hwc_window_data->validated_type == TDM_HWC_WIN_COMPOSITION_CLIENT)
                        continue;
                if (hwc_window_data == hwc_data->target_hwc_window)
                        continue;
@@ -218,9 +218,9 @@ _sprd_hwc_apply_policy(tdm_sprd_hwc_data *hwc_data , tdm_hwc_window **composited
 
        /* 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;
        }
 
        /* use the target_window to commit when there is no window. */
@@ -231,13 +231,13 @@ _sprd_hwc_apply_policy(tdm_sprd_hwc_data *hwc_data , tdm_hwc_window **composited
 
        /* count the composited(visible) windows */
        for (i = 0; i < num_wnds; i++) {
-               if (composited_list[i]->client_type == TDM_COMPOSITION_CURSOR)
+               if (composited_list[i]->client_type == TDM_HWC_WIN_COMPOSITION_CURSOR)
                        cursor_count++;
-               if (composited_list[i]->client_type == TDM_COMPOSITION_CLIENT)
+               if (composited_list[i]->client_type == TDM_HWC_WIN_COMPOSITION_CLIENT)
                        client_count++;
-               if (client_count == 0 && composited_list[i]->client_type == TDM_COMPOSITION_DEVICE)
+               if (client_count == 0 && composited_list[i]->client_type == TDM_HWC_WIN_COMPOSITION_DEVICE)
                        device_count++;
-               if (composited_list[i]->client_type == TDM_COMPOSITION_VIDEO)
+               if (composited_list[i]->client_type == TDM_HWC_WIN_COMPOSITION_VIDEO)
                        video_count++;
        }
 
@@ -254,8 +254,8 @@ _sprd_hwc_apply_policy(tdm_sprd_hwc_data *hwc_data , tdm_hwc_window **composited
        /* NUM_UI_LAYSERS is 1, so device_count always 1 at this point */
        while (device_count > 0) {
                        /* for video */
-                       if (composited_list[next_idx]->client_type == TDM_COMPOSITION_VIDEO) {
-                               composited_list[next_idx]->validated_type = TDM_COMPOSITION_VIDEO;
+                       if (composited_list[next_idx]->client_type == TDM_HWC_WIN_COMPOSITION_VIDEO) {
+                               composited_list[next_idx]->validated_type = TDM_HWC_WIN_COMPOSITION_VIDEO;
                                composited_list[next_idx]->lzpos = video_lzpos;
                                next_idx++;
                                continue;
@@ -270,14 +270,14 @@ _sprd_hwc_apply_policy(tdm_sprd_hwc_data *hwc_data , tdm_hwc_window **composited
 
                        /* set clients below when the hwc_window does not have the reserved buffer */
                        if (!_sprd_hwc_window_has_reserved_buffer(composited_list[next_idx])) {
-                               composited_list[next_idx]->validated_type = TDM_COMPOSITION_CLIENT;
+                               composited_list[next_idx]->validated_type = TDM_HWC_WIN_COMPOSITION_CLIENT;
                                composited_list[next_idx]->lzpos = -1;
                                next_idx++;
                                break;
                        }
 
                        /* set the OSD */
-                       composited_list[next_idx]->validated_type = TDM_COMPOSITION_DEVICE;
+                       composited_list[next_idx]->validated_type = TDM_HWC_WIN_COMPOSITION_DEVICE;
                        composited_list[next_idx]->lzpos = ui_lzpos--;
                        next_idx++;
 
@@ -289,14 +289,14 @@ set_clients_below:
                hwc_data->need_target_window = 1;
 
                /* for video */
-               if (composited_list[next_idx]->client_type == TDM_COMPOSITION_VIDEO) {
-                       composited_list[next_idx]->validated_type = TDM_COMPOSITION_VIDEO;
+               if (composited_list[next_idx]->client_type == TDM_HWC_WIN_COMPOSITION_VIDEO) {
+                       composited_list[next_idx]->validated_type = TDM_HWC_WIN_COMPOSITION_VIDEO;
                        composited_list[next_idx]->lzpos = video_lzpos;
                        next_idx++;
                        continue;
                }
-               composited_list[next_idx]->constraints = TDM_CONSTRAINT_NONE;
-               composited_list[next_idx]->validated_type = TDM_COMPOSITION_CLIENT;
+               composited_list[next_idx]->constraints = TDM_HWC_WIN_CONSTRAINT_NONE;
+               composited_list[next_idx]->validated_type = TDM_HWC_WIN_COMPOSITION_CLIENT;
                composited_list[next_idx]->lzpos = -1;
                next_idx++;
        }