hwc: use vc4_output_data_get_layer_data instead of _vc4_hwc_get_layer

Change-Id: I02f22a2ea5434169bfeb0526f6258ff3f4c2a376

diff --git a/src/tdm_vc4.h b/src/tdm_vc4.h
index c17992d..1898d54 100644 (file)
--- a/src/tdm_vc4.h
+++ b/src/tdm_vc4.h
@@ -92,4 +92,6 @@ tdm_error     tdm_vc4_display_create_output_list(tdm_vc4_data *vc4_data);
 void           tdm_vc4_display_destroy_output_list(tdm_vc4_data *vc4_data);
 tdm_error      tdm_vc4_display_create_layer_list(tdm_vc4_data *vc4_data);
 
+tdm_vc4_layer_data * vc4_output_data_get_layer_data(tdm_vc4_output_data *output_data, int layer_zops);
+
 #endif /* _TDM_VC4_H_ */

diff --git a/src/tdm_vc4_display.c b/src/tdm_vc4_display.c
index c60fb09..b70e4f9 100644 (file)
--- a/src/tdm_vc4_display.c
+++ b/src/tdm_vc4_display.c
@@ -2364,3 +2364,18 @@ vc4_layer_unset_buffer(tdm_layer *layer)
 
        return TDM_ERROR_NONE;
 }
+
+tdm_vc4_layer_data *
+vc4_output_data_get_layer_data(tdm_vc4_output_data *output_data, int layer_zpos)
+{
+       tdm_vc4_layer_data *l = NULL;
+
+       RETURN_VAL_IF_FAIL(output_data, NULL);
+
+       LIST_FOR_EACH_ENTRY(l, &output_data->layer_list, link) {
+               if (l->zpos == layer_zpos)
+                       return l;
+       }
+
+       return NULL;
+}
\ No newline at end of file

diff --git a/src/tdm_vc4_hwc.c b/src/tdm_vc4_hwc.c
index 364a356..e3daa2f 100644 (file)
--- a/src/tdm_vc4_hwc.c
+++ b/src/tdm_vc4_hwc.c
@@ -129,19 +129,6 @@ _vc4_hwc_window_get_tbm_buffer_queue(tdm_hwc_window *hwc_window, tdm_error *erro
        return tqueue;
 }
 
-tdm_vc4_layer_data *
-_vc4_hwc_get_layer(tdm_vc4_hwc_data *hwc_data, int layer_zops)
-{
-       tdm_vc4_output_data *output_data = hwc_data->output_data;
-       tdm_vc4_layer_data *l = NULL;
-
-       LIST_FOR_EACH_ENTRY(l, &output_data->layer_list, link)
-               if (l->zpos == layer_zops)
-                       return l;
-
-       return NULL;
-}
-
 static tdm_error
 _vc4_hwc_layer_attach_window(tdm_vc4_layer_data *layer_data, tdm_vc4_hwc_window_data *hwc_window_data)
 {
@@ -174,7 +161,7 @@ _vc4_hwc_prepare_commit(tdm_vc4_hwc_data *hwc_data)
 
        /* set target hwc window to the layer */
        if (hwc_data->need_target_window) {
-               layer_data = _vc4_hwc_get_layer(hwc_data, hwc_data->target_hwc_window->lzpos);
+               layer_data = vc4_output_data_get_layer_data(hwc_data->output_data, hwc_data->target_hwc_window->lzpos);
                _vc4_hwc_layer_attach_window(layer_data, hwc_data->target_hwc_window);
                use_layers_zpos[hwc_data->target_hwc_window->lzpos] = 1;
        }
@@ -188,7 +175,7 @@ _vc4_hwc_prepare_commit(tdm_vc4_hwc_data *hwc_data)
                if (hwc_window_data == hwc_data->target_hwc_window)
                        continue;
 
-               layer_data = _vc4_hwc_get_layer(hwc_data, hwc_window_data->lzpos);
+               layer_data = vc4_output_data_get_layer_data(hwc_data->output_data, hwc_window_data->lzpos);
                _vc4_hwc_layer_attach_window(layer_data, hwc_window_data);
                use_layers_zpos[hwc_window_data->lzpos] = 1;
        }
@@ -198,7 +185,7 @@ _vc4_hwc_prepare_commit(tdm_vc4_hwc_data *hwc_data)
                if (use_layers_zpos[lzpos])
                        continue;
 
-               layer_data = _vc4_hwc_get_layer(hwc_data, lzpos);
+               layer_data = vc4_output_data_get_layer_data(hwc_data->output_data, lzpos);
                if (!layer_data)
                        continue;