Do not allocate backend data

backend data is allocated in hal-api

Change-Id: Ifd5c5146bb83c8458fc9a5928bfd744363b87edb

diff --git a/src/tdm_backend_meson.c b/src/tdm_backend_meson.c
index 85895cd541314fd04d32f146e16085ac7673b60d..7b465fd821029ea30fed0a76167053d7df591f26 100644 (file)
--- a/src/tdm_backend_meson.c
+++ b/src/tdm_backend_meson.c
@@ -328,23 +328,6 @@ hal_backend_tdm_meson_exit(void *data)
        display_data = (tdm_meson_display *)backend_data->display;
        TDM_BACKEND_RETURN_VAL_IF_FAIL(display_data != NULL, -1);
 
-       if (backend_data->hwc_window_funcs) {
-               free(backend_data->hwc_window_funcs);
-               backend_data->hwc_window_funcs = NULL;
-       }
-       if (backend_data->hwc_funcs) {
-               free(backend_data->hwc_funcs);
-               backend_data->hwc_funcs = NULL;
-       }
-       if (backend_data->output_funcs) {
-               free(backend_data->output_funcs);
-               backend_data->output_funcs = NULL;
-       }
-       if (backend_data->display_funcs) {
-               free(backend_data->display_funcs);
-               backend_data->display_funcs = NULL;
-       }
-
        _tdm_meson_display_deinitialize(display_data);
 
 #ifdef HAVE_UDEV
@@ -355,10 +338,8 @@ hal_backend_tdm_meson_exit(void *data)
        if (display_data->drm_fd >= 0)
                close(display_data->drm_fd);
 
-       free(display_data);
-       display_data = NULL;
-
-       free(backend_data);
+       free(backend_data->display);
+       backend_data->display = NULL;
 
        return HAL_TDM_ERROR_NONE;
 }
@@ -367,10 +348,6 @@ static int
 hal_backend_tdm_meson_init(void **data)
 {
        hal_tdm_backend_data *backend_data = NULL;
-       hal_tdm_display_funcs *display_funcs = NULL;
-       hal_tdm_output_funcs *output_funcs = NULL;
-       hal_tdm_hwc_funcs *hwc_funcs = NULL;
-       hal_tdm_hwc_window_funcs *hwc_window_funcs = NULL;
        tdm_meson_display *display_data = NULL;
        hal_tdm_error ret;
        int drm_fd;
@@ -379,20 +356,22 @@ hal_backend_tdm_meson_init(void **data)
        hal_tdm_event_source *udev_event_source;
 #endif
 
-       /* allocate a hal_tdm_backend_data */
-       backend_data = calloc(1, sizeof(struct _hal_tdm_backend_data));
+       if (!data) {
+               TDM_BACKEND_ERR("data is NULL");
+               return -1;
+       }
+
+       backend_data = *(hal_tdm_backend_data **)data;
        if (!backend_data) {
-               TDM_BACKEND_ERR("fail to alloc backend_data!\n");
-               *data = NULL;
+               TDM_BACKEND_ERR("backend_data is NULL");
                return -1;
        }
-       *data = backend_data;
 
        /* allocate a hal_tdm_display */
        display_data = calloc(1, sizeof(struct _tdm_meson_display));
        if (!display_data) {
                TDM_BACKEND_ERR("fail to alloc display_data!\n");
-               goto failed;
+               return -1;
        }
        backend_data->display = (hal_tdm_display *)display_data;
 
@@ -457,86 +436,54 @@ hal_backend_tdm_meson_init(void **data)
        backend_data->num_event_sources++;
 #endif
 
-       /* alloc and register display_funcs */
-       display_funcs = calloc(1, sizeof(struct _hal_tdm_display_funcs));
-       if (!display_funcs) {
-               TDM_BACKEND_ERR("fail to alloc display_funcs!\n");
-               goto failed;
-       }
-       backend_data->display_funcs = display_funcs;
-
-       display_funcs->display_get_capability = meson_display_get_capability;
-       display_funcs->display_get_outputs = meson_display_get_outputs;
-       display_funcs->display_get_fd = meson_display_get_fd;
-       display_funcs->display_handle_events = meson_display_handle_events;
-
-       /* alloc and register output_funcs */
-       output_funcs = calloc(1, sizeof(struct _hal_tdm_output_funcs));
-       if (!output_funcs) {
-               TDM_BACKEND_ERR("fail to alloc output_funcs!\n");
-               goto failed;
-       }
-       backend_data->output_funcs = output_funcs;
-
-       output_funcs->output_get_capability = meson_output_get_capability;
-       output_funcs->output_set_property = meson_output_set_property;
-       output_funcs->output_get_property = meson_output_get_property;
-       output_funcs->output_wait_vblank = meson_output_wait_vblank;
-       output_funcs->output_set_vblank_handler = meson_output_set_vblank_handler;
-       output_funcs->output_set_dpms = meson_output_set_dpms;
-       output_funcs->output_get_dpms = meson_output_get_dpms;
-       output_funcs->output_set_mode = meson_output_set_mode;
-       output_funcs->output_get_mode = meson_output_get_mode;
+       backend_data->display_funcs->display_get_capability = meson_display_get_capability;
+       backend_data->display_funcs->display_get_outputs = meson_display_get_outputs;
+       backend_data->display_funcs->display_get_fd = meson_display_get_fd;
+       backend_data->display_funcs->display_handle_events = meson_display_handle_events;
+
+       backend_data->output_funcs->output_get_capability = meson_output_get_capability;
+       backend_data->output_funcs->output_set_property = meson_output_set_property;
+       backend_data->output_funcs->output_get_property = meson_output_get_property;
+       backend_data->output_funcs->output_wait_vblank = meson_output_wait_vblank;
+       backend_data->output_funcs->output_set_vblank_handler = meson_output_set_vblank_handler;
+       backend_data->output_funcs->output_set_dpms = meson_output_set_dpms;
+       backend_data->output_funcs->output_get_dpms = meson_output_get_dpms;
+       backend_data->output_funcs->output_set_mode = meson_output_set_mode;
+       backend_data->output_funcs->output_get_mode = meson_output_get_mode;
 #ifdef HAVE_UDEV
-       output_funcs->output_set_status_handler = meson_output_set_status_handler;
+       backend_data->output_funcs->output_set_status_handler = meson_output_set_status_handler;
 #endif
-       output_funcs->output_get_hwc = meson_output_get_hwc;
-
-       /* alloc and register hwc_funcs */
-       hwc_funcs = calloc(1, sizeof(struct _hal_tdm_hwc_funcs));
-       if (!hwc_funcs) {
-               TDM_BACKEND_ERR("fail to alloc hwc_funcs!\n");
-               goto failed;
-       }
-       backend_data->hwc_funcs = hwc_funcs;
-
-       hwc_funcs->hwc_create_window = meson_hwc_create_window;
-       hwc_funcs->hwc_get_video_supported_formats = meson_hwc_get_video_supported_formats;
-       hwc_funcs->hwc_get_video_available_properties = NULL;
-       hwc_funcs->hwc_get_capabilities = meson_hwc_get_capabilities;
-       hwc_funcs->hwc_get_available_properties = meson_hwc_get_available_properties;
-       hwc_funcs->hwc_get_client_target_buffer_queue = meson_hwc_get_client_target_buffer_queue;
-       hwc_funcs->hwc_set_client_target_buffer = meson_hwc_set_client_target_buffer;
-       hwc_funcs->hwc_set_client_target_acquire_fence = meson_hwc_set_client_target_acquire_fence;
-       hwc_funcs->hwc_validate = meson_hwc_validate;
-       hwc_funcs->hwc_get_changed_composition_types = meson_hwc_get_changed_composition_types;
-       hwc_funcs->hwc_accept_validation = meson_hwc_accept_validation;
-       hwc_funcs->hwc_commit = meson_hwc_commit;
-       hwc_funcs->hwc_set_commit_handler = meson_hwc_set_commit_handler;
-       hwc_funcs->hwc_get_commit_fence = meson_hwc_get_commit_fence;
-       hwc_funcs->hwc_get_release_fences = meson_hwc_get_release_fences;
-
-       /* alloc and register hwc_window_funcs */
-       hwc_window_funcs = calloc(1, sizeof(struct _hal_tdm_hwc_window_funcs));
-       if (!hwc_window_funcs) {
-               TDM_BACKEND_ERR("fail to alloc hwc_window_funcs!\n");
-               goto failed;
-       }
-       backend_data->hwc_window_funcs = hwc_window_funcs;
-
-       hwc_window_funcs->hwc_window_destroy = meson_hwc_window_destroy;
-       hwc_window_funcs->hwc_window_acquire_buffer_queue = NULL; // no need
-       hwc_window_funcs->hwc_window_release_buffer_queue = NULL; // no need
-       hwc_window_funcs->hwc_window_set_composition_type = meson_hwc_window_set_composition_type;
-       hwc_window_funcs->hwc_window_set_buffer_damage = meson_hwc_window_set_buffer_damage;
-       hwc_window_funcs->hwc_window_set_info = meson_hwc_window_set_info;
-       hwc_window_funcs->hwc_window_set_buffer = meson_hwc_window_set_buffer;
-       hwc_window_funcs->hwc_window_set_property = meson_hwc_window_set_property;
-       hwc_window_funcs->hwc_window_get_property = meson_hwc_window_get_property;
-       hwc_window_funcs->hwc_window_get_constraints = meson_hwc_window_get_constraints;
-       hwc_window_funcs->hwc_window_set_name = meson_hwc_window_set_name;
-       hwc_window_funcs->hwc_window_set_cursor_image = meson_hwc_window_set_cursor_image;
-       hwc_window_funcs->hwc_window_set_acquire_fence = meson_hwc_window_set_acquire_fence;
+       backend_data->output_funcs->output_get_hwc = meson_output_get_hwc;
+
+       backend_data->hwc_funcs->hwc_create_window = meson_hwc_create_window;
+       backend_data->hwc_funcs->hwc_get_video_supported_formats = meson_hwc_get_video_supported_formats;
+       backend_data->hwc_funcs->hwc_get_video_available_properties = NULL;
+       backend_data->hwc_funcs->hwc_get_capabilities = meson_hwc_get_capabilities;
+       backend_data->hwc_funcs->hwc_get_available_properties = meson_hwc_get_available_properties;
+       backend_data->hwc_funcs->hwc_get_client_target_buffer_queue = meson_hwc_get_client_target_buffer_queue;
+       backend_data->hwc_funcs->hwc_set_client_target_buffer = meson_hwc_set_client_target_buffer;
+       backend_data->hwc_funcs->hwc_set_client_target_acquire_fence = meson_hwc_set_client_target_acquire_fence;
+       backend_data->hwc_funcs->hwc_validate = meson_hwc_validate;
+       backend_data->hwc_funcs->hwc_get_changed_composition_types = meson_hwc_get_changed_composition_types;
+       backend_data->hwc_funcs->hwc_accept_validation = meson_hwc_accept_validation;
+       backend_data->hwc_funcs->hwc_commit = meson_hwc_commit;
+       backend_data->hwc_funcs->hwc_set_commit_handler = meson_hwc_set_commit_handler;
+       backend_data->hwc_funcs->hwc_get_commit_fence = meson_hwc_get_commit_fence;
+       backend_data->hwc_funcs->hwc_get_release_fences = meson_hwc_get_release_fences;
+
+       backend_data->hwc_window_funcs->hwc_window_destroy = meson_hwc_window_destroy;
+       backend_data->hwc_window_funcs->hwc_window_acquire_buffer_queue = NULL; // no need
+       backend_data->hwc_window_funcs->hwc_window_release_buffer_queue = NULL; // no need
+       backend_data->hwc_window_funcs->hwc_window_set_composition_type = meson_hwc_window_set_composition_type;
+       backend_data->hwc_window_funcs->hwc_window_set_buffer_damage = meson_hwc_window_set_buffer_damage;
+       backend_data->hwc_window_funcs->hwc_window_set_info = meson_hwc_window_set_info;
+       backend_data->hwc_window_funcs->hwc_window_set_buffer = meson_hwc_window_set_buffer;
+       backend_data->hwc_window_funcs->hwc_window_set_property = meson_hwc_window_set_property;
+       backend_data->hwc_window_funcs->hwc_window_get_property = meson_hwc_window_get_property;
+       backend_data->hwc_window_funcs->hwc_window_get_constraints = meson_hwc_window_get_constraints;
+       backend_data->hwc_window_funcs->hwc_window_set_name = meson_hwc_window_set_name;
+       backend_data->hwc_window_funcs->hwc_window_set_cursor_image = meson_hwc_window_set_cursor_image;
+       backend_data->hwc_window_funcs->hwc_window_set_acquire_fence = meson_hwc_window_set_acquire_fence;
 
        TDM_BACKEND_INFO("init success!");