From 5c085284e4ee58080f4a67f6dc9914ac9c2e49cf Mon Sep 17 00:00:00 2001 From: Boram Park Date: Fri, 8 Sep 2017 14:35:40 +0900 Subject: [PATCH 01/16] use SW timer when output disconnected If enable_fake == 1, use SW timer when output disconnected as well as DPMS off. Change-Id: I9e528b6eb6749d099c6b8f7ff765ce46a7728f5a --- client/tdm_client.c | 22 +++++++++---- client/tdm_client.h | 14 +++++--- src/tdm_vblank.c | 93 +++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 92 insertions(+), 37 deletions(-) diff --git a/client/tdm_client.c b/client/tdm_client.c index 6ab849d..d80100d 100644 --- a/client/tdm_client.c +++ b/client/tdm_client.c @@ -833,11 +833,16 @@ tdm_client_vblank_wait(tdm_client_vblank *vblank, unsigned int interval, tdm_cli if (!private_vblank->started) private_vblank->started = 1; - if (private_output->watch_output_changes) - if (private_output->dpms != TDM_OUTPUT_DPMS_ON && !private_vblank->enable_fake) { - TDM_INFO("dpms off"); + if (private_output->watch_output_changes && !private_vblank->enable_fake) { + if (private_output->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) { + TDM_ERR("output disconnected"); + return TDM_ERROR_OUTPUT_DISCONNECTED; + } + if (private_output->dpms != TDM_OUTPUT_DPMS_ON) { + TDM_ERR("dpms off"); return TDM_ERROR_DPMS_OFF; } + } w = calloc(1, sizeof *w); if (!w) { @@ -910,11 +915,16 @@ tdm_client_vblank_wait_seq(tdm_client_vblank *vblank, unsigned int sequence, if (!private_vblank->started) private_vblank->started = 1; - if (private_output->watch_output_changes) - if (private_output->dpms != TDM_OUTPUT_DPMS_ON && !private_vblank->enable_fake) { - TDM_INFO("dpms off"); + if (private_output->watch_output_changes && !private_vblank->enable_fake) { + if (private_output->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) { + TDM_ERR("output disconnected"); + return TDM_ERROR_OUTPUT_DISCONNECTED; + } + if (private_output->dpms != TDM_OUTPUT_DPMS_ON) { + TDM_ERR("dpms off"); return TDM_ERROR_DPMS_OFF; } + } w = calloc(1, sizeof *w); if (!w) { diff --git a/client/tdm_client.h b/client/tdm_client.h index 8a2fcd0..175bb45 100644 --- a/client/tdm_client.h +++ b/client/tdm_client.h @@ -226,6 +226,12 @@ tdm_client_output_get_dpms(tdm_client_output *output, tdm_output_dpms *dpms); /** * @brief Create the client vblank object of the given client output + * @details + * tdm client vblank basically uses the HW vblank resource. Therefore, if HW vblank + * is not available for some reasons, such as output disconnection and dpms off, + * #tdm_client_vblank_wait will return error. If you want it to work propery in spite + * of these reasons, you can use #tdm_client_vblank_set_enable_fake to get SW fake + * vblank events. * @param[in] output The client output object * @param[out] error #TDM_ERROR_NONE if success. Otherwise, error value. * @return A client vblank object if success. Otherwise, NULL. @@ -286,8 +292,8 @@ tdm_client_vblank_set_offset(tdm_client_vblank *vblank, int offset_ms); /** * @brief Enable/Disable the fake vblank to the client vblank object * @details - * If enable_fake == 0, #tdm_client_vblank_wait will return TDM_ERROR_DPMS_OFF - * when DPMS off. Otherwise, #tdm_client_vblank_wait will return TDM_ERROR_NONE + * If enable_fake == 0, #tdm_client_vblank_wait will return error when HW vblank is + * not available. Otherwise, #tdm_client_vblank_wait will return TDM_ERROR_NONE * as success. Once #tdm_client_vblank_wait returns TDM_ERROR_NONE, the user client * vblank handler(#tdm_client_vblank_handler) SHOULD be called after the given * interval of #tdm_client_vblank_wait. Default is @b disable. @@ -301,7 +307,7 @@ tdm_client_vblank_set_enable_fake(tdm_client_vblank *vblank, unsigned int enable /** * @brief Wait for a vblank * @details - * This function will return TDM_ERROR_DPMS_OFF when DPMS off. However, + * This function will return error when HW vblank resource is not available. However, * #tdm_client_vblank_wait will return TDM_ERROR_NONE as success if * #tdm_client_vblank_set_enable_fake sets true. Once #tdm_client_vblank_wait * returns TDM_ERROR_NONE, the user client vblank handler(#tdm_client_vblank_handler) @@ -389,7 +395,7 @@ tdm_client_vblank_wait(tdm_client_vblank *vblank, unsigned int interval, tdm_cli /** * @brief Wait for a vblank with the target sequence number * @details - * This function will return TDM_ERROR_DPMS_OFF when DPMS off. However, + * This function will return error when HW vblank resource is not available. However, * #tdm_client_vblank_wait will return TDM_ERROR_NONE as success if * #tdm_client_vblank_set_enable_fake sets true. Once #tdm_client_vblank_wait_seq * returns TDM_ERROR_NONE, the user client vblank handler(#tdm_client_vblank_handler) diff --git a/src/tdm_vblank.c b/src/tdm_vblank.c index 97deab5..337e7cf 100644 --- a/src/tdm_vblank.c +++ b/src/tdm_vblank.c @@ -54,6 +54,8 @@ * - use a tdm_event_loop_source object only. */ +#define TDM_VBLANK_DEFAULT_VREFRESH 30 + /* We expact "(unsigned int)(0.0016667 / 0.0016667) = 1". But it becomes 0. */ #define TDM_TIME_MARGIN 0.0000001 @@ -89,12 +91,14 @@ typedef struct _tdm_private_vblank { tdm_display *dpy; tdm_output *output; + tdm_output_conn_status connection; tdm_output_dpms dpms; unsigned int vrefresh; unsigned int check_HW_or_SW; char name[TDM_NAME_LEN]; unsigned int fps; + unsigned int fps_changeable; int offset; unsigned int enable_fake; unsigned int ignore_global_fps; @@ -308,6 +312,39 @@ _tdm_vblank_free_HW_wait(tdm_private_vblank *private_vblank, tdm_error error, un } static void +_tdm_vblank_update_output_info(tdm_private_vblank *private_vblank) +{ + tdm_output *output = private_vblank->output; + tdm_output_conn_status connection = TDM_OUTPUT_CONN_STATUS_DISCONNECTED; + tdm_output_dpms dpms = TDM_OUTPUT_DPMS_OFF; + unsigned int vrefresh = 0; + + tdm_output_get_conn_status(output, &connection); + + if (connection != TDM_OUTPUT_CONN_STATUS_DISCONNECTED) { + const tdm_output_mode *mode = NULL; + tdm_output_get_mode(output, &mode); + vrefresh = (mode) ? mode->vrefresh : 0; + tdm_output_get_dpms(output, &dpms); + } + + if (vrefresh == 0) + vrefresh = TDM_VBLANK_DEFAULT_VREFRESH; + + private_vblank->dpms = dpms; + private_vblank->connection = connection; + private_vblank->vrefresh = vrefresh; + private_vblank->HW_vblank_gap = 1.0 / private_vblank->vrefresh; + + if (private_vblank->fps_changeable) + private_vblank->fps = vrefresh; + + VDB("dpms(%d) connection(%d) vrefresh(%d) fps(%d)", + private_vblank->dpms, private_vblank->connection, + private_vblank->vrefresh, private_vblank->fps); +} + +static void _tdm_vblank_cb_output_change(tdm_output *output, tdm_output_change_type type, tdm_value value, void *user_data) { @@ -320,7 +357,7 @@ _tdm_vblank_cb_output_change(tdm_output *output, tdm_output_change_type type, if (private_vblank->dpms == value.u32) break; VDB("dpms %s", tdm_dpms_str(value.u32)); - private_vblank->dpms = value.u32; + _tdm_vblank_update_output_info(private_vblank); private_vblank->check_HW_or_SW = 1; if (private_vblank->dpms != TDM_OUTPUT_DPMS_ON) { if (private_vblank->enable_fake) @@ -330,9 +367,17 @@ _tdm_vblank_cb_output_change(tdm_output *output, tdm_output_change_type type, } break; case TDM_OUTPUT_CHANGE_CONNECTION: + if (private_vblank->connection == value.u32) + break; VDB("output %s", tdm_status_str(value.u32)); - if (value.u32 == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) - _tdm_vblank_free_HW_wait(private_vblank, 0, 0); + _tdm_vblank_update_output_info(private_vblank); + private_vblank->check_HW_or_SW = 1; + if (private_vblank->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) { + if (private_vblank->enable_fake) + _tdm_vblank_change_to_SW(private_vblank); + else + _tdm_vblank_free_HW_wait(private_vblank, TDM_ERROR_OUTPUT_DISCONNECTED, 1); + } break; default: break; @@ -410,8 +455,6 @@ EXTERN tdm_vblank * tdm_vblank_create(tdm_display *dpy, tdm_output *output, tdm_error *error) { tdm_private_vblank *private_vblank; - const tdm_output_mode *mode = NULL; - tdm_output_dpms dpms = TDM_OUTPUT_DPMS_ON; tdm_error ret; TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(dpy != NULL, TDM_ERROR_INVALID_PARAMETER, NULL); @@ -432,16 +475,6 @@ tdm_vblank_create(tdm_display *dpy, tdm_output *output, tdm_error *error) vblank_list_inited = 1; } - tdm_output_get_mode(output, &mode); - if (!mode) { - if (error) - *error = TDM_ERROR_OPERATION_FAILED; - TDM_ERR("no mode"); - return NULL; - } - - tdm_output_get_dpms(output, &dpms); - private_vblank = calloc(1, sizeof * private_vblank); if (!private_vblank) { if (error) @@ -456,12 +489,10 @@ tdm_vblank_create(tdm_display *dpy, tdm_output *output, tdm_error *error) private_vblank->owner_tid = syscall(SYS_gettid); private_vblank->dpy = dpy; private_vblank->output = output; - private_vblank->dpms = dpms; - private_vblank->vrefresh = mode->vrefresh; - private_vblank->HW_vblank_gap = 1.0 / private_vblank->vrefresh; - private_vblank->check_HW_or_SW = 1; - private_vblank->fps = mode->vrefresh; + private_vblank->fps_changeable = 1; + + _tdm_vblank_update_output_info(private_vblank); strncpy(private_vblank->name, TDM_VBLANK_DEFAULT_NAME, TDM_NAME_LEN - 1); private_vblank->name[TDM_NAME_LEN - 1] = '\0'; @@ -472,8 +503,8 @@ tdm_vblank_create(tdm_display *dpy, tdm_output *output, tdm_error *error) _tdm_vblank_valid_list_add(&private_vblank->valid_link, &valid_vblank_list); if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("created. vrefresh(%d) dpms(%d)", - private_vblank->vrefresh, private_vblank->dpms); + VIN("created. vrefresh(%d) dpms(%d) connection(%d)", + private_vblank->vrefresh, private_vblank->dpms, private_vblank->connection); return (tdm_vblank *)private_vblank; } @@ -556,6 +587,7 @@ tdm_vblank_set_fps(tdm_vblank *vblank, unsigned int fps) return TDM_ERROR_NONE; private_vblank->fps = fps; + private_vblank->fps_changeable = 0; private_vblank->check_HW_or_SW = 1; if (tdm_debug_module & TDM_DEBUG_VBLANK) @@ -1022,9 +1054,15 @@ tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec, return TDM_ERROR_BAD_REQUEST; } - if (private_vblank->dpms != TDM_OUTPUT_DPMS_ON && !private_vblank->enable_fake) { - VIN("can't wait a vblank because of DPMS off"); - return TDM_ERROR_DPMS_OFF; + if (!private_vblank->enable_fake) { + if (private_vblank->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) { + VIN("can't wait a vblank: output disconnected"); + return TDM_ERROR_OUTPUT_DISCONNECTED; + } + if (private_vblank->dpms != TDM_OUTPUT_DPMS_ON) { + VIN("can't wait a vblank: DPMS off"); + return TDM_ERROR_DPMS_OFF; + } } wait_info = calloc(1, sizeof * wait_info); @@ -1072,7 +1110,8 @@ tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec, */ if (private_vblank->vrefresh % fps) wait_info->type = VBLANK_TYPE_SW; - else if (private_vblank->dpms == TDM_OUTPUT_DPMS_OFF) + else if (private_vblank->dpms == TDM_OUTPUT_DPMS_OFF || + private_vblank->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) wait_info->type = VBLANK_TYPE_SW_FAKE; else if (private_vblank->offset == 0) wait_info->type = VBLANK_TYPE_HW; @@ -1083,7 +1122,7 @@ tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec, ret = _tdm_vblank_wait_SW(wait_info); else { ret = _tdm_vblank_wait_HW(wait_info); - if (ret == TDM_ERROR_DPMS_OFF) + if (ret == TDM_ERROR_OUTPUT_DISCONNECTED || ret == TDM_ERROR_DPMS_OFF) ret = _tdm_vblank_wait_SW(wait_info); } -- 2.7.4 From a053f094985bf7814ee8f4b1bf51f9af6321dd99 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Fri, 8 Sep 2017 15:24:28 +0900 Subject: [PATCH 02/16] add debugging logs Change-Id: I3aae4e23b3d6b24f8638ea58673a63e844acb5fa --- src/tdm_server.c | 6 +-- src/tdm_vblank.c | 111 ++++++++++++++++++++++++++++++------------------------- 2 files changed, 64 insertions(+), 53 deletions(-) diff --git a/src/tdm_server.c b/src/tdm_server.c index ca994ce..a8f7175 100644 --- a/src/tdm_server.c +++ b/src/tdm_server.c @@ -176,7 +176,7 @@ _tdm_server_send_done(tdm_server_wait_info *wait_info, tdm_error error, } if (tdm_debug_module & TDM_DEBUG_VBLANK) - TDM_INFO("req_id(%d) done", wait_info->req_id); + TDM_DBG("req_id(%d) done", wait_info->req_id); TDM_TRACE_COUNT(ServerDoneVBlank, wait_info->req_id); @@ -317,7 +317,7 @@ _tdm_server_vblank_cb_wait_vblank(struct wl_client *client, struct wl_resource * wait_info->req_id = req_id; if (tdm_debug_module & TDM_DEBUG_VBLANK) - TDM_INFO("req_id(%d) wait", req_id); + TDM_DBG("req_id(%d) wait", req_id); ret = tdm_vblank_wait(vblank_info->vblank, req_sec, req_usec, interval, _tdm_server_cb_vblank, wait_info); @@ -359,7 +359,7 @@ _tdm_server_vblank_cb_wait_vblank_seq(struct wl_client *client, struct wl_resour wait_info->req_id = req_id; if (tdm_debug_module & TDM_DEBUG_VBLANK) - TDM_INFO("req_id(%d) wait", req_id); + TDM_DBG("req_id(%d) wait", req_id); ret = tdm_vblank_wait_seq(vblank_info->vblank, req_sec, req_usec, sequence, _tdm_server_cb_vblank, wait_info); diff --git a/src/tdm_vblank.c b/src/tdm_vblank.c index 337e7cf..2c5eca4 100644 --- a/src/tdm_vblank.c +++ b/src/tdm_vblank.c @@ -71,8 +71,8 @@ #define VER(fmt, arg...) TDM_ERR("[%p] "fmt, private_vblank, ##arg) #define VWR(fmt, arg...) TDM_WRN("[%p] "fmt, private_vblank, ##arg) -#define VIN(fmt, arg...) TDM_INFO("[%p] "fmt, private_vblank, ##arg) -#define VDB(fmt, arg...) TDM_DBG("[%p] "fmt, private_vblank, ##arg) +#define VIN(fmt, arg...) do { if (tdm_debug_module & TDM_DEBUG_VBLANK) TDM_INFO("[%p] "fmt, private_vblank, ##arg); } while (0) +#define VDB(fmt, arg...) do { if (tdm_debug_module & TDM_DEBUG_VBLANK) TDM_DBG("[%p] "fmt, private_vblank, ##arg); } while (0) typedef enum { VBLANK_TYPE_SW, @@ -81,6 +81,12 @@ typedef enum { VBLANK_TYPE_HW_SW, } tdm_vblank_wait_type; +typedef enum { + VBLANK_EVENT_TYPE_NONE, + VBLANK_EVENT_TYPE_SW, + VBLANK_EVENT_TYPE_HW, +} tdm_vblank_event_type; + typedef struct _tdm_vblank_wait_info tdm_vblank_wait_info; typedef struct _tdm_private_vblank { @@ -95,6 +101,7 @@ typedef struct _tdm_private_vblank { tdm_output_dpms dpms; unsigned int vrefresh; + tdm_vblank_event_type last_type; unsigned int check_HW_or_SW; char name[TDM_NAME_LEN]; unsigned int fps; @@ -324,12 +331,17 @@ _tdm_vblank_update_output_info(tdm_private_vblank *private_vblank) if (connection != TDM_OUTPUT_CONN_STATUS_DISCONNECTED) { const tdm_output_mode *mode = NULL; tdm_output_get_mode(output, &mode); - vrefresh = (mode) ? mode->vrefresh : 0; + if (mode) + vrefresh = mode->vrefresh; + else + VWR("mode not setted!!!"); tdm_output_get_dpms(output, &dpms); } - if (vrefresh == 0) + if (vrefresh == 0) { + VWR("vrefresh can't be zero !!!"); vrefresh = TDM_VBLANK_DEFAULT_VREFRESH; + } private_vblank->dpms = dpms; private_vblank->connection = connection; @@ -339,9 +351,9 @@ _tdm_vblank_update_output_info(tdm_private_vblank *private_vblank) if (private_vblank->fps_changeable) private_vblank->fps = vrefresh; - VDB("dpms(%d) connection(%d) vrefresh(%d) fps(%d)", + VIN("dpms(%d) connection(%d) vrefresh(%d) fps(%d) fps_changeable(%d)", private_vblank->dpms, private_vblank->connection, - private_vblank->vrefresh, private_vblank->fps); + private_vblank->vrefresh, private_vblank->fps, private_vblank->fps_changeable); } static void @@ -356,7 +368,7 @@ _tdm_vblank_cb_output_change(tdm_output *output, tdm_output_change_type type, case TDM_OUTPUT_CHANGE_DPMS: if (private_vblank->dpms == value.u32) break; - VDB("dpms %s", tdm_dpms_str(value.u32)); + VIN("dpms %s", tdm_dpms_str(value.u32)); _tdm_vblank_update_output_info(private_vblank); private_vblank->check_HW_or_SW = 1; if (private_vblank->dpms != TDM_OUTPUT_DPMS_ON) { @@ -369,7 +381,7 @@ _tdm_vblank_cb_output_change(tdm_output *output, tdm_output_change_type type, case TDM_OUTPUT_CHANGE_CONNECTION: if (private_vblank->connection == value.u32) break; - VDB("output %s", tdm_status_str(value.u32)); + VIN("output %s", tdm_status_str(value.u32)); _tdm_vblank_update_output_info(private_vblank); private_vblank->check_HW_or_SW = 1; if (private_vblank->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) { @@ -502,9 +514,8 @@ tdm_vblank_create(tdm_display *dpy, tdm_output *output, tdm_error *error) _tdm_vblank_valid_list_add(&private_vblank->valid_link, &valid_vblank_list); - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("created. vrefresh(%d) dpms(%d) connection(%d)", - private_vblank->vrefresh, private_vblank->dpms, private_vblank->connection); + VIN("created. vrefresh(%d) dpms(%d) connection(%d)", + private_vblank->vrefresh, private_vblank->dpms, private_vblank->connection); return (tdm_vblank *)private_vblank; } @@ -537,8 +548,7 @@ tdm_vblank_destroy(tdm_vblank *vblank) free(w); } - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("destroyed"); + VIN("destroyed"); free(private_vblank); } @@ -556,8 +566,7 @@ tdm_vblank_set_name(tdm_vblank *vblank, const char *name) strncpy(private_vblank->name, name, TDM_NAME_LEN - 1); private_vblank->name[TDM_NAME_LEN - 1] = '\0'; - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("name(%s)", name); + VIN("name(%s)", name); return TDM_ERROR_NONE; } @@ -583,16 +592,17 @@ tdm_vblank_set_fps(tdm_vblank *vblank, unsigned int fps) TDM_RETURN_VAL_IF_FAIL(private_vblank != NULL, TDM_ERROR_INVALID_PARAMETER); TDM_RETURN_VAL_IF_FAIL(fps > 0, TDM_ERROR_INVALID_PARAMETER); + if (private_vblank->fps != fps || private_vblank->fps_changeable) + VIN("fps(%d) fps_changeable(0)", fps); + + private_vblank->fps_changeable = 0; + if (private_vblank->fps == fps) return TDM_ERROR_NONE; private_vblank->fps = fps; - private_vblank->fps_changeable = 0; private_vblank->check_HW_or_SW = 1; - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("fps(%d)", private_vblank->fps); - return TDM_ERROR_NONE; } @@ -622,8 +632,7 @@ tdm_vblank_ignore_global_fps(tdm_vblank *vblank, unsigned int ignore) private_vblank->ignore_global_fps = ignore; private_vblank->check_HW_or_SW = 1; - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("ignore_global_fps(%d)", private_vblank->ignore_global_fps); + VIN("ignore_global_fps(%d)", private_vblank->ignore_global_fps); return TDM_ERROR_NONE; } @@ -641,8 +650,7 @@ tdm_vblank_set_offset(tdm_vblank *vblank, int offset) private_vblank->offset = offset; private_vblank->check_HW_or_SW = 1; - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("offset(%d)", private_vblank->offset); + VIN("offset(%d)", private_vblank->offset); return TDM_ERROR_NONE; } @@ -672,8 +680,7 @@ tdm_vblank_set_enable_fake(tdm_vblank *vblank, unsigned int enable_fake) private_vblank->enable_fake = enable_fake; - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("enable_fake(%d)", private_vblank->enable_fake); + VIN("enable_fake(%d)", private_vblank->enable_fake); return TDM_ERROR_NONE; } @@ -719,8 +726,8 @@ _tdm_vblank_sw_timer_update(tdm_private_vblank *private_vblank) if (ms_delay > 5000) VER("wait(%p) curr(%.6f) target(%.6f) ms_delay(%d)", first_wait_info, curr, target, ms_delay); - else if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("wait(%p) curr(%.6f) target(%.6f) ms_delay(%d)", first_wait_info, curr, target, ms_delay); + else + VDB("wait(%p) curr(%.6f) target(%.6f) ms_delay(%d)", first_wait_info, curr, target, ms_delay); tdm_display_lock(private_vblank->dpy); @@ -735,7 +742,7 @@ _tdm_vblank_sw_timer_update(tdm_private_vblank *private_vblank) VER("couldn't add timer"); return ret; } - VIN("Use SW vblank"); + VIN("Create SW timer"); } ret = tdm_event_loop_source_timer_update(private_vblank->SW_timer, ms_delay); @@ -788,8 +795,7 @@ _tdm_vblank_cb_vblank_HW(tdm_output *output, unsigned int sequence, /* wait_info will be freed in _tdm_vblank_cb_vblank_SW() */ if (ret == TDM_ERROR_NONE) { - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("wait(%p) SW timer", wait_info); + VDB("wait(%p) SW timer", wait_info); return; } @@ -810,8 +816,7 @@ _tdm_vblank_cb_vblank_HW(tdm_output *output, unsigned int sequence, private_vblank->last_seq = wait_info->target_seq; private_vblank->last_time = TDM_TIME(tv_sec, tv_usec); - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("wait(%p) last(%.6f) sequence(%u) done", wait_info, private_vblank->last_time, wait_info->target_seq); + VDB("wait(%p) last(%.6f) sequence(%u) done", wait_info, private_vblank->last_time, wait_info->target_seq); if (wait_info->func) wait_info->func(private_vblank, TDM_ERROR_NONE, wait_info->target_seq, @@ -829,6 +834,11 @@ _tdm_vblank_wait_HW(tdm_vblank_wait_info *wait_info) int hw_interval; tdm_error ret; + if (private_vblank->last_type != VBLANK_EVENT_TYPE_HW) { + VIN("Use HW vblank"); + private_vblank->last_type = VBLANK_EVENT_TYPE_HW; + } + _tdm_vblank_insert_wait(wait_info, &private_vblank->HW_wait_list); hw_interval = wait_info->interval * private_vblank->quotient; @@ -840,9 +850,9 @@ _tdm_vblank_wait_HW(tdm_vblank_wait_info *wait_info) /* +1 ms to call the handler ASAP at the first. no matter for SW timer. */ wait_info->target_seq = 1; - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("wait(%p) last(%.6f) hw_itvl(%d) targ_seq(%u)", - wait_info, private_vblank->last_time, hw_interval, wait_info->target_seq); + + VDB("wait(%p) last(%.6f) hw_itvl(%d) targ_seq(%u)", + wait_info, private_vblank->last_time, hw_interval, wait_info->target_seq); } else { double last, prev, req, curr, target; unsigned int skip; @@ -871,8 +881,8 @@ _tdm_vblank_wait_HW(tdm_vblank_wait_info *wait_info) VER("wait(%p) last(%.6f) req(%.6f) prev(%.6f) curr(%.6f) targ(%.6f,%.6f) skip(%u) hw_itvl(%d) targ_seq(%u)", wait_info, last, req - last, prev - last, curr - last, target, target - last, skip, hw_interval, wait_info->target_seq); - else if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("wait(%p) last(%.6f) req(%.6f) prev(%.6f) curr(%.6f) targ(%.6f,%.6f) skip(%u) hw_itvl(%d) targ_seq(%u)", + else + VDB("wait(%p) last(%.6f) req(%.6f) prev(%.6f) curr(%.6f) targ(%.6f,%.6f) skip(%u) hw_itvl(%d) targ_seq(%u)", wait_info, last, req - last, prev - last, curr - last, target, target - last, skip, hw_interval, wait_info->target_seq); } @@ -889,8 +899,7 @@ _tdm_vblank_wait_HW(tdm_vblank_wait_info *wait_info) return ret; } - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("wait(%p) waiting", wait_info); + VDB("wait(%p) waiting", wait_info); return TDM_ERROR_NONE; } @@ -952,8 +961,7 @@ tdm_vblank_cb_vblank_SW(tdm_vblank *vblank, double vblank_stamp) private_vblank->last_seq = first_wait_info->target_seq; private_vblank->last_time = first_wait_info->target_time; - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("wait(%p) last(%.6f) sequence(%u) done", first_wait_info, private_vblank->last_time, first_wait_info->target_seq); + VDB("wait(%p) last(%.6f) sequence(%u) done", first_wait_info, private_vblank->last_time, first_wait_info->target_seq); LIST_FOR_EACH_ENTRY_SAFE(w, ww, &private_vblank->SW_wait_list, link) { if (w->target_time != first_wait_info->target_time) @@ -982,6 +990,11 @@ _tdm_vblank_wait_SW(tdm_vblank_wait_info *wait_info) tdm_private_vblank *private_vblank = wait_info->private_vblank; tdm_error ret; + if (private_vblank->last_type != VBLANK_EVENT_TYPE_SW) { + VIN("Use SW vblank"); + private_vblank->last_type = VBLANK_EVENT_TYPE_SW; + } + if (private_vblank->last_time == 0) { /* SW vblank starts from now. SW vblank doesn't need to be aligned with HW vblank. */ private_vblank->last_seq = 0; @@ -991,9 +1004,8 @@ _tdm_vblank_wait_SW(tdm_vblank_wait_info *wait_info) wait_info->target_seq = 1; wait_info->target_time = private_vblank->last_time + 0.001; - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("wait(%p) last(%.6f) target(%.6f) target sequence(%u)", - wait_info, private_vblank->last_time, wait_info->target_time, wait_info->target_seq); + VDB("wait(%p) last(%.6f) target(%.6f) target sequence(%u)", + wait_info, private_vblank->last_time, wait_info->target_time, wait_info->target_seq); } else { double last, prev, req, curr, target; unsigned int skip; @@ -1019,10 +1031,9 @@ _tdm_vblank_wait_SW(tdm_vblank_wait_info *wait_info) wait_info->target_time = target; - if (tdm_debug_module & TDM_DEBUG_VBLANK) - VIN("wait(%p) last(%.6f) req(%.6f) prev(%.6f) curr(%.6f) targ(%.6f,%.6f) skip(%u) targ_seq(%u)", - wait_info, last, req - last, prev - last, curr - last, - target, target - last, skip, wait_info->target_seq); + VDB("wait(%p) last(%.6f) req(%.6f) prev(%.6f) curr(%.6f) targ(%.6f,%.6f) skip(%u) targ_seq(%u)", + wait_info, last, req - last, prev - last, curr - last, + target, target - last, skip, wait_info->target_seq); } _tdm_vblank_insert_wait(wait_info, &private_vblank->SW_wait_list); @@ -1056,11 +1067,11 @@ tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec, if (!private_vblank->enable_fake) { if (private_vblank->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) { - VIN("can't wait a vblank: output disconnected"); + VER("can't wait a vblank: output disconnected"); return TDM_ERROR_OUTPUT_DISCONNECTED; } if (private_vblank->dpms != TDM_OUTPUT_DPMS_ON) { - VIN("can't wait a vblank: DPMS off"); + VER("can't wait a vblank: DPMS off"); return TDM_ERROR_DPMS_OFF; } } -- 2.7.4 From cf1e6c471a5cb12ab99fd3ab7e9273c8c7fbc414 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Fri, 8 Sep 2017 16:43:44 +0900 Subject: [PATCH 03/16] package vesion up to 1.7.8 Change-Id: Iaeeff325761e15d591326dbf73ce63be53bedb9f --- packaging/libtdm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec index 8c78b8b..32c0e1c 100644 --- a/packaging/libtdm.spec +++ b/packaging/libtdm.spec @@ -1,7 +1,7 @@ %bcond_with utest Name: libtdm -Version: 1.7.7 +Version: 1.7.8 Release: 0 Summary: User Library of Tizen Display Manager Group: Development/Libraries -- 2.7.4 From dbf220bc30ca25a0cd05cb0d1d8626215d7470a7 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Wed, 13 Sep 2017 16:12:54 +0900 Subject: [PATCH 04/16] load a dummy module if failed to load a default module Change-Id: I29efec59122b4e6b4a9666b901edf214fd09221b --- src/tdm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/tdm.c b/src/tdm.c index 7723018..a27247b 100644 --- a/src/tdm.c +++ b/src/tdm.c @@ -659,7 +659,8 @@ tdm_display_update(tdm_display *dpy) } #define SUFFIX_MODULE ".so" -#define DEFAULT_MODULE "libtdm-default"SUFFIX_MODULE +#define TDM_DEFAULT_MODULE "libtdm-default"SUFFIX_MODULE +#define TDM_DUMMY_MODULE "libtdm-dummy"SUFFIX_MODULE int tdm_debug_module; int tdm_debug_dump; @@ -844,13 +845,18 @@ _tdm_display_load_module(tdm_private_display *private_display) module_name = getenv("TDM_MODULE"); if (!module_name) - module_name = DEFAULT_MODULE; + module_name = TDM_DEFAULT_MODULE; /* load bufmgr priv from default lib */ ret = _tdm_display_load_module_with_file(private_display, module_name); if (ret == TDM_ERROR_NONE) return TDM_ERROR_NONE; + /* load bufmgr priv from dummy lib */ + ret = _tdm_display_load_module_with_file(private_display, TDM_DUMMY_MODULE); + if (ret == TDM_ERROR_NONE) + return TDM_ERROR_NONE; + /* load bufmgr priv from configured path */ n = scandir(TDM_MODULE_PATH, &namelist, 0, alphasort); if (n < 0) { -- 2.7.4 From daa2f47914cf0fbba3cc20359fc95b5fec77ade7 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Wed, 13 Sep 2017 12:41:19 +0900 Subject: [PATCH 05/16] backend: add dummy backend. Change-Id: I5829d55e3f14d531c55adab3fde9bcaf145464cd --- Makefile.am | 4 +- backends/Makefile.am | 1 + backends/dummy/Makefile.am | 14 + backends/dummy/tdm_dummy.c | 134 ++++++++ backends/dummy/tdm_dummy.h | 76 +++++ backends/dummy/tdm_dummy_display.c | 636 +++++++++++++++++++++++++++++++++++++ configure.ac | 3 + packaging/libtdm.spec | 1 + 8 files changed, 867 insertions(+), 2 deletions(-) create mode 100644 backends/Makefile.am create mode 100644 backends/dummy/Makefile.am create mode 100644 backends/dummy/tdm_dummy.c create mode 100644 backends/dummy/tdm_dummy.h create mode 100644 backends/dummy/tdm_dummy_display.c diff --git a/Makefile.am b/Makefile.am index 292911f..8b6604d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ if HAVE_UTEST -SUBDIRS = . include protocol common src client tools ut +SUBDIRS = . include protocol common src backends client tools ut else -SUBDIRS = . include protocol common src client tools +SUBDIRS = . include protocol common src backends client tools endif pkgconfigdir = $(libdir)/pkgconfig diff --git a/backends/Makefile.am b/backends/Makefile.am new file mode 100644 index 0000000..4a66860 --- /dev/null +++ b/backends/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = dummy diff --git a/backends/dummy/Makefile.am b/backends/dummy/Makefile.am new file mode 100644 index 0000000..459ffe1 --- /dev/null +++ b/backends/dummy/Makefile.am @@ -0,0 +1,14 @@ +AM_CFLAGS = \ + $(CFLAGS) \ + $(TDM_CFLAGS) \ + -I$(top_srcdir)/include + +libtdm_dummy_la_LTLIBRARIES = libtdm-dummy.la +libtdm_dummy_ladir = $(TDM_MODULE_PATH) +libtdm_dummy_la_LDFLAGS = -module -avoid-version +libtdm_dummy_la_LIBADD = $(TDM_LIBS) $(top_builddir)/src/libtdm.la + +libtdm_dummy_la_SOURCES = \ + tdm_dummy_display.c \ + tdm_dummy.c + diff --git a/backends/dummy/tdm_dummy.c b/backends/dummy/tdm_dummy.c new file mode 100644 index 0000000..a39f579 --- /dev/null +++ b/backends/dummy/tdm_dummy.c @@ -0,0 +1,134 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "tdm_dummy.h" + +static tdm_dummy_data *dummy_data; + +void +tdm_dummy_deinit(tdm_backend_data *bdata) +{ + if (dummy_data != bdata) + return; + + TDM_INFO("deinit"); + + tdm_dummy_display_destroy_output_list(dummy_data); + + if (dummy_data->pipe[0] >= 0) + close(dummy_data->pipe[0]); + if (dummy_data->pipe[1] >= 0) + close(dummy_data->pipe[1]); + + free(dummy_data); + dummy_data = NULL; +} + +tdm_backend_data * +tdm_dummy_init(tdm_display *dpy, tdm_error *error) +{ + tdm_func_display dummy_func_display; + tdm_func_output dummy_func_output; + tdm_func_layer dummy_func_layer; + tdm_error ret; + + if (!dpy) { + TDM_ERR("display is null"); + if (error) + *error = TDM_ERROR_INVALID_PARAMETER; + return NULL; + } + + if (dummy_data) { + TDM_ERR("failed: init twice"); + if (error) + *error = TDM_ERROR_BAD_REQUEST; + return NULL; + } + + dummy_data = calloc(1, sizeof(tdm_dummy_data)); + if (!dummy_data) { + TDM_ERR("alloc failed"); + if (error) + *error = TDM_ERROR_OUT_OF_MEMORY; + return NULL; + } + + LIST_INITHEAD(&dummy_data->output_list); + LIST_INITHEAD(&dummy_data->buffer_list); + + memset(&dummy_func_display, 0, sizeof(dummy_func_display)); + dummy_func_display.display_get_capability = dummy_display_get_capability; + dummy_func_display.display_get_outputs = dummy_display_get_outputs; + dummy_func_display.display_get_fd = dummy_display_get_fd; + dummy_func_display.display_handle_events = dummy_display_handle_events; + + memset(&dummy_func_output, 0, sizeof(dummy_func_output)); + dummy_func_output.output_get_capability = dummy_output_get_capability; + dummy_func_output.output_get_layers = dummy_output_get_layers; + dummy_func_output.output_wait_vblank = dummy_output_wait_vblank; + dummy_func_output.output_set_vblank_handler = dummy_output_set_vblank_handler; + dummy_func_output.output_commit = dummy_output_commit; + dummy_func_output.output_set_commit_handler = dummy_output_set_commit_handler; + dummy_func_output.output_set_mode = dummy_output_set_mode; + dummy_func_output.output_get_mode = dummy_output_get_mode; + + memset(&dummy_func_layer, 0, sizeof(dummy_func_layer)); + dummy_func_layer.layer_get_capability = dummy_layer_get_capability; + dummy_func_layer.layer_set_info = dummy_layer_set_info; + dummy_func_layer.layer_get_info = dummy_layer_get_info; + dummy_func_layer.layer_set_buffer = dummy_layer_set_buffer; + dummy_func_layer.layer_unset_buffer = dummy_layer_unset_buffer; + + ret = tdm_backend_register_func_display(dpy, &dummy_func_display); + if (ret != TDM_ERROR_NONE) + goto failed; + + ret = tdm_backend_register_func_output(dpy, &dummy_func_output); + if (ret != TDM_ERROR_NONE) + goto failed; + + ret = tdm_backend_register_func_layer(dpy, &dummy_func_layer); + if (ret != TDM_ERROR_NONE) + goto failed; + + dummy_data->dpy = dpy; + + if (pipe(dummy_data->pipe) < 0) { + TDM_ERR("failed get pipe: %m"); + ret = TDM_ERROR_OPERATION_FAILED; + goto failed; + } + + ret = tdm_dummy_display_create_output_list(dummy_data); + if (ret != TDM_ERROR_NONE) + goto failed; + + ret = tdm_dummy_display_create_layer_list(dummy_data); + if (ret != TDM_ERROR_NONE) + goto failed; + + if (error) + *error = TDM_ERROR_NONE; + + TDM_INFO("init success!"); + + return (tdm_backend_data *)dummy_data; +failed: + if (error) + *error = ret; + + tdm_dummy_deinit(dummy_data); + + TDM_ERR("init failed!"); + return NULL; +} + +tdm_backend_module tdm_backend_module_data = { + "Dummy", + "Samsung", + TDM_BACKEND_SET_ABI_VERSION(1, 1), + tdm_dummy_init, + tdm_dummy_deinit +}; diff --git a/backends/dummy/tdm_dummy.h b/backends/dummy/tdm_dummy.h new file mode 100644 index 0000000..a55f4c4 --- /dev/null +++ b/backends/dummy/tdm_dummy.h @@ -0,0 +1,76 @@ +#ifndef _TDM_DUMMY_H_ +#define _TDM_DUMMY_H_ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +/* dummy backend functions (display) */ +tdm_error dummy_display_get_capability(tdm_backend_data *bdata, tdm_caps_display *caps); +tdm_output** dummy_display_get_outputs(tdm_backend_data *bdata, int *count, tdm_error *error); +tdm_error dummy_display_get_fd(tdm_backend_data *bdata, int *fd); +tdm_error dummy_display_handle_events(tdm_backend_data *bdata); + +tdm_error dummy_output_get_capability(tdm_output *output, tdm_caps_output *caps); +tdm_layer** dummy_output_get_layers(tdm_output *output, int *count, tdm_error *error); +tdm_error dummy_output_wait_vblank(tdm_output *output, int interval, int sync, void *user_data); +tdm_error dummy_output_set_vblank_handler(tdm_output *output, tdm_output_vblank_handler func); +tdm_error dummy_output_commit(tdm_output *output, int sync, void *user_data); +tdm_error dummy_output_set_commit_handler(tdm_output *output, tdm_output_commit_handler func); +tdm_error dummy_output_set_mode(tdm_output *output, const tdm_output_mode *mode); +tdm_error dummy_output_get_mode(tdm_output *output, const tdm_output_mode **mode); + +tdm_error dummy_layer_get_capability(tdm_layer *layer, tdm_caps_layer *caps); +tdm_error dummy_layer_set_info(tdm_layer *layer, tdm_info_layer *info); +tdm_error dummy_layer_get_info(tdm_layer *layer, tdm_info_layer *info); +tdm_error dummy_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer); +tdm_error dummy_layer_unset_buffer(tdm_layer *layer); + +#define RETURN_VAL_IF_FAIL(cond, val) {\ + if (!(cond)) {\ + TDM_ERR("'%s' failed", #cond);\ + return val;\ + }\ +} + +#define GOTO_IF_FAIL(cond, val) {\ + if (!(cond)) {\ + TDM_ERR("'%s' failed", #cond);\ + goto val;\ + }\ +} + +typedef struct _tdm_dummy_data +{ + tdm_display *dpy; + + int pipe[2]; + + struct list_head output_list; + struct list_head buffer_list; +} tdm_dummy_data; + +tdm_error tdm_dummy_display_create_output_list(tdm_dummy_data *dummy_data); +void tdm_dummy_display_destroy_output_list(tdm_dummy_data *dummy_data); +tdm_error tdm_dummy_display_create_layer_list(tdm_dummy_data *dummy_data); + +#endif /* _TDM_DUMMY_H_ */ diff --git a/backends/dummy/tdm_dummy_display.c b/backends/dummy/tdm_dummy_display.c new file mode 100644 index 0000000..5e64fb3 --- /dev/null +++ b/backends/dummy/tdm_dummy_display.c @@ -0,0 +1,636 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "tdm_dummy.h" + +typedef struct _tdm_dummy_output_data tdm_dummy_output_data; +typedef struct _tdm_dummy_layer_data tdm_dummy_layer_data; +typedef struct _tdm_dummy_event_data tdm_dummy_event_data; + +typedef enum { + TDM_DUMMY_EVENT_TYPE_WAIT, + TDM_DUMMY_EVENT_TYPE_COMMIT, +} tdm_dummy_event_type; + +struct _tdm_dummy_event_data { + struct list_head link; + + tdm_dummy_event_type type; + tdm_dummy_output_data *output_data; + void *user_data; +}; + +struct _tdm_dummy_output_data { + struct list_head link; + + /* data which are fixed at initializing */ + tdm_dummy_data *dummy_data; + + uint32_t pipe; + tdm_output_mode *output_mode; + tdm_output_type connector_type; + struct list_head layer_list; + tdm_dummy_layer_data *primary_layer; + + /* not fixed data below */ + tdm_output_vblank_handler vblank_func; + tdm_output_commit_handler commit_func; + + tdm_output_conn_status status; + + int mode_changed; + const tdm_output_mode *current_mode; + + tdm_event_loop_source *timer; + unsigned int timer_waiting; + struct list_head timer_event_list; +}; + +struct _tdm_dummy_layer_data { + struct list_head link; + + /* data which are fixed at initializing */ + tdm_dummy_data *dummy_data; + tdm_dummy_output_data *output_data; + tdm_layer_capability capabilities; + int zpos; + + /* not fixed data below */ + tdm_info_layer info; + int info_changed; + + tbm_surface_h display_buffer; + int display_buffer_changed; +}; + +static void +_tdm_dummy_display_cb_event(tdm_dummy_output_data *output_data, tdm_dummy_event_data *event_data, + unsigned int sequence, unsigned int tv_sec, unsigned int tv_usec) +{ + switch (event_data->type) { + case TDM_DUMMY_EVENT_TYPE_WAIT: + if (output_data->vblank_func) + output_data->vblank_func(output_data, sequence, tv_sec, tv_usec, event_data->user_data); + break; + case TDM_DUMMY_EVENT_TYPE_COMMIT: + if (output_data->commit_func) + output_data->commit_func(output_data, sequence, tv_sec, tv_usec, event_data->user_data); + break; + default: + break; + } +} + +static tdm_error +_tdm_dummy_display_cb_timeout(void *user_data) +{ + tdm_dummy_output_data *output_data = user_data; + tdm_dummy_event_data *e = NULL, *ee = NULL; + unsigned int tv_sec, tv_usec; + static unsigned int sequence = 0; + struct timespec tp; + + sequence++; + + if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) { + tv_sec = tp.tv_sec; + tv_usec = tp.tv_nsec / 1000; + } else { + tv_sec = tv_usec = 0; + } + + LIST_FOR_EACH_ENTRY_SAFE(e, ee, &output_data->timer_event_list, link) { + LIST_DEL(&e->link); + _tdm_dummy_display_cb_event(output_data, e, sequence, tv_sec, tv_usec); + free(e); + } + + return TDM_ERROR_NONE; +} + +static tdm_error +_tdm_dummy_display_wait_vblank(tdm_dummy_output_data *output_data, tdm_dummy_event_data *event_data) +{ + tdm_error ret; + unsigned int ms; + + RETURN_VAL_IF_FAIL(output_data->timer != NULL, TDM_ERROR_OPERATION_FAILED); + RETURN_VAL_IF_FAIL(output_data->output_mode->vrefresh > 0, TDM_ERROR_OPERATION_FAILED); + + if (output_data->timer_waiting) { + LIST_ADDTAIL(&event_data->link, &output_data->timer_event_list); + return TDM_ERROR_NONE; + } + + ms = 1000 / output_data->output_mode->vrefresh; + + ret = tdm_event_loop_source_timer_update(output_data->timer, ms); + if (ret != TDM_ERROR_NONE) + return ret; + + LIST_ADDTAIL(&event_data->link, &output_data->timer_event_list); + + return TDM_ERROR_NONE; +} + +static void +_tdm_dummy_display_destroy_layer_list(tdm_dummy_data *dummy_data) +{ + tdm_dummy_output_data *o = NULL; + + LIST_FOR_EACH_ENTRY(o, &dummy_data->output_list, link) { + tdm_dummy_layer_data *l = NULL, *ll = NULL; + LIST_FOR_EACH_ENTRY_SAFE(l, ll, &o->layer_list, link) { + LIST_DEL(&l->link); + free(l); + } + } +} + +tdm_error +tdm_dummy_display_create_layer_list(tdm_dummy_data *dummy_data) +{ + tdm_dummy_output_data *output_data = NULL; + tdm_error ret = TDM_ERROR_NONE; + + if (LIST_IS_EMPTY(&dummy_data->output_list)) { + TDM_ERR("no output"); + return TDM_ERROR_OPERATION_FAILED; + } + + /* The TDM dummy backend only support one output. */ + LIST_FOR_EACH_ENTRY(output_data, &dummy_data->output_list, link) { + tdm_dummy_layer_data *layer_data = calloc(1, sizeof(tdm_dummy_layer_data)); + if (!layer_data) { + TDM_ERR("alloc failed"); + ret = TDM_ERROR_OUT_OF_MEMORY; + goto failed; + } + + layer_data->dummy_data = dummy_data; + layer_data->output_data = output_data; + layer_data->zpos = 0; + + layer_data->capabilities = TDM_LAYER_CAPABILITY_PRIMARY | TDM_LAYER_CAPABILITY_GRAPHIC; + output_data->primary_layer = layer_data; + + LIST_ADDTAIL(&layer_data->link, &output_data->layer_list); + } + + return TDM_ERROR_NONE; +failed: + _tdm_dummy_display_destroy_layer_list(dummy_data); + return ret; +} + +void +tdm_dummy_display_destroy_output_list(tdm_dummy_data *dummy_data) +{ + tdm_dummy_output_data *o = NULL, *oo = NULL; + + if (LIST_IS_EMPTY(&dummy_data->output_list)) + return; + + _tdm_dummy_display_destroy_layer_list(dummy_data); + + LIST_FOR_EACH_ENTRY_SAFE(o, oo, &dummy_data->output_list, link) { + LIST_DEL(&o->link); + + if (!LIST_IS_EMPTY(&o->timer_event_list)) { + tdm_dummy_event_data *e = NULL, *ee = NULL; + LIST_FOR_EACH_ENTRY_SAFE(e, ee, &o->timer_event_list, link) { + LIST_DEL(&e->link); + free(e); + } + } + + if (o->timer) + tdm_event_loop_source_remove(o->timer); + + free(o->output_mode); + free(o); + } +} + +tdm_error +tdm_dummy_display_create_output_list(tdm_dummy_data *dummy_data) +{ + tdm_dummy_output_data *output_data; + tdm_error ret; + + RETURN_VAL_IF_FAIL(LIST_IS_EMPTY(&dummy_data->output_list), TDM_ERROR_OPERATION_FAILED); + + output_data = calloc(1, sizeof(tdm_dummy_output_data)); + if (!output_data) { + TDM_ERR("alloc failed"); + ret = TDM_ERROR_OUT_OF_MEMORY; + goto failed_create; + } + + LIST_INITHEAD(&output_data->layer_list); + + output_data->dummy_data = dummy_data; + output_data->pipe = 0; + output_data->connector_type = TDM_OUTPUT_TYPE_Unknown; + output_data->status = TDM_OUTPUT_CONN_STATUS_CONNECTED; + + output_data->output_mode = calloc(1, sizeof(tdm_output_mode)); + if (!output_data->output_mode) { + TDM_ERR("alloc failed"); + free(output_data); + ret = TDM_ERROR_OUT_OF_MEMORY; + goto failed_create; + } + + snprintf(output_data->output_mode->name, TDM_NAME_LEN, "640x480"); + output_data->output_mode->vrefresh = 30; + output_data->output_mode->clock = 25200; + output_data->output_mode->hdisplay = 640; + output_data->output_mode->hsync_start = 656; + output_data->output_mode->hsync_end = 752; + output_data->output_mode->htotal = 800; + output_data->output_mode->hskew = 0; + output_data->output_mode->vdisplay = 480; + output_data->output_mode->vsync_start = 490; + output_data->output_mode->vsync_end = 492; + output_data->output_mode->vtotal = 525; + output_data->output_mode->vscan = 0; + output_data->output_mode->flags = 0; + output_data->output_mode->type = 0; + + output_data->timer = tdm_event_loop_add_timer_handler(dummy_data->dpy, + _tdm_dummy_display_cb_timeout, + output_data, + &ret); + if (!output_data->timer) { + free(output_data); + return ret; + } + + LIST_INITHEAD(&output_data->timer_event_list); + + LIST_ADDTAIL(&output_data->link, &dummy_data->output_list); + + return TDM_ERROR_NONE; +failed_create: + tdm_dummy_display_destroy_output_list(dummy_data); + return ret; +} + +tdm_error +dummy_display_get_capability(tdm_backend_data *bdata, tdm_caps_display *caps) +{ + RETURN_VAL_IF_FAIL(caps, TDM_ERROR_INVALID_PARAMETER); + + caps->max_layer_count = -1; /* not defined */ + + return TDM_ERROR_NONE; +} + +tdm_output ** +dummy_display_get_outputs(tdm_backend_data *bdata, int *count, tdm_error *error) +{ + tdm_dummy_data *dummy_data = bdata; + tdm_dummy_output_data *output_data = NULL; + tdm_output **outputs; + tdm_error ret; + int i; + + RETURN_VAL_IF_FAIL(dummy_data, NULL); + RETURN_VAL_IF_FAIL(count, NULL); + + *count = 0; + LIST_FOR_EACH_ENTRY(output_data, &dummy_data->output_list, link) + (*count)++; + + if (*count == 0) { + ret = TDM_ERROR_NONE; + goto failed_get; + } + + /* will be freed in frontend */ + outputs = calloc(*count, sizeof(tdm_dummy_output_data *)); + if (!outputs) { + TDM_ERR("failed: alloc memory"); + *count = 0; + ret = TDM_ERROR_OUT_OF_MEMORY; + goto failed_get; + } + + i = 0; + LIST_FOR_EACH_ENTRY(output_data, &dummy_data->output_list, link) + outputs[i++] = output_data; + + if (error) + *error = TDM_ERROR_NONE; + + return outputs; +failed_get: + if (error) + *error = ret; + return NULL; +} + +tdm_error +dummy_display_get_fd(tdm_backend_data *bdata, int *fd) +{ + tdm_dummy_data *dummy_data = bdata; + + RETURN_VAL_IF_FAIL(dummy_data, TDM_ERROR_INVALID_PARAMETER); + RETURN_VAL_IF_FAIL(fd, TDM_ERROR_INVALID_PARAMETER); + + *fd = dummy_data->pipe[0]; + + return TDM_ERROR_NONE; +} + +tdm_error +dummy_display_handle_events(tdm_backend_data *bdata) +{ + return TDM_ERROR_NONE; +} + +tdm_error +dummy_output_get_capability(tdm_output *output, tdm_caps_output *caps) +{ + tdm_dummy_output_data *output_data = output; + tdm_error ret; + + RETURN_VAL_IF_FAIL(output_data, TDM_ERROR_INVALID_PARAMETER); + RETURN_VAL_IF_FAIL(caps, TDM_ERROR_INVALID_PARAMETER); + + memset(caps, 0, sizeof(tdm_caps_output)); + + snprintf(caps->maker, TDM_NAME_LEN, "dummy"); + snprintf(caps->model, TDM_NAME_LEN, "dummy"); + snprintf(caps->name, TDM_NAME_LEN, "dummy"); + + caps->status = output_data->status; + caps->type = output_data->connector_type; + caps->type_id = 0; + + caps->mode_count = 1; + caps->modes = calloc(1, sizeof(tdm_output_mode)); + if (!caps->modes) { + ret = TDM_ERROR_OUT_OF_MEMORY; + TDM_ERR("alloc failed\n"); + goto failed_get; + } + + *caps->modes = *output_data->output_mode; + + caps->mmWidth = 640; + caps->mmHeight = 480; + caps->subpixel = 1; + + caps->min_w = -1; + caps->min_h = -1; + caps->max_w = -1; + caps->max_h = -1; + caps->preferred_align = -1; + + caps->prop_count = 0; + + return TDM_ERROR_NONE; +failed_get: + memset(caps, 0, sizeof(tdm_caps_output)); + return ret; +} + +tdm_layer ** +dummy_output_get_layers(tdm_output *output, int *count, tdm_error *error) +{ + tdm_dummy_output_data *output_data = output; + tdm_dummy_layer_data *layer_data = NULL; + tdm_layer **layers; + tdm_error ret; + int i; + + RETURN_VAL_IF_FAIL(output_data, NULL); + RETURN_VAL_IF_FAIL(count, NULL); + + *count = 0; + LIST_FOR_EACH_ENTRY(layer_data, &output_data->layer_list, link) + (*count)++; + + if (*count == 0) { + ret = TDM_ERROR_NONE; + goto failed_get; + } + + /* will be freed in frontend */ + layers = calloc(*count, sizeof(tdm_dummy_layer_data *)); + if (!layers) { + TDM_ERR("failed: alloc memory"); + *count = 0; + ret = TDM_ERROR_OUT_OF_MEMORY; + goto failed_get; + } + + i = 0; + LIST_FOR_EACH_ENTRY(layer_data, &output_data->layer_list, link) + layers[i++] = layer_data; + + if (error) + *error = TDM_ERROR_NONE; + + return layers; +failed_get: + if (error) + *error = ret; + return NULL; +} + +tdm_error +dummy_output_wait_vblank(tdm_output *output, int interval, int sync, void *user_data) +{ + tdm_dummy_output_data *output_data = output; + tdm_dummy_event_data *event_data; + tdm_error ret; + + RETURN_VAL_IF_FAIL(output_data, TDM_ERROR_INVALID_PARAMETER); + + event_data = calloc(1, sizeof(tdm_dummy_event_data)); + if (!event_data) { + TDM_ERR("alloc failed"); + return TDM_ERROR_OUT_OF_MEMORY; + } + + event_data->type = TDM_DUMMY_EVENT_TYPE_WAIT; + event_data->output_data = output_data; + event_data->user_data = user_data; + + ret = _tdm_dummy_display_wait_vblank(output_data, event_data); + if (ret != TDM_ERROR_NONE) { + free(event_data); + return ret; + } + + return TDM_ERROR_NONE; +} + +tdm_error +dummy_output_set_vblank_handler(tdm_output *output, tdm_output_vblank_handler func) +{ + tdm_dummy_output_data *output_data = output; + + RETURN_VAL_IF_FAIL(output_data, TDM_ERROR_INVALID_PARAMETER); + RETURN_VAL_IF_FAIL(func, TDM_ERROR_INVALID_PARAMETER); + + output_data->vblank_func = func; + + return TDM_ERROR_NONE; +} + +tdm_error +dummy_output_commit(tdm_output *output, int sync, void *user_data) +{ + tdm_dummy_output_data *output_data = output; + tdm_dummy_event_data *event_data; + tdm_error ret; + + RETURN_VAL_IF_FAIL(output_data, TDM_ERROR_INVALID_PARAMETER); + + event_data = calloc(1, sizeof(tdm_dummy_event_data)); + if (!event_data) { + TDM_ERR("alloc failed"); + return TDM_ERROR_OUT_OF_MEMORY; + } + + event_data->type = TDM_DUMMY_EVENT_TYPE_COMMIT; + event_data->output_data = output_data; + event_data->user_data = user_data; + + ret = _tdm_dummy_display_wait_vblank(output_data, event_data); + if (ret != TDM_ERROR_NONE) { + free(event_data); + return ret; + } + + return TDM_ERROR_NONE; +} + +tdm_error +dummy_output_set_commit_handler(tdm_output *output, tdm_output_commit_handler func) +{ + tdm_dummy_output_data *output_data = output; + + RETURN_VAL_IF_FAIL(output_data, TDM_ERROR_INVALID_PARAMETER); + RETURN_VAL_IF_FAIL(func, TDM_ERROR_INVALID_PARAMETER); + + output_data->commit_func = func; + + return TDM_ERROR_NONE; +} + +tdm_error +dummy_output_set_mode(tdm_output *output, const tdm_output_mode *mode) +{ + tdm_dummy_output_data *output_data = output; + + RETURN_VAL_IF_FAIL(output_data, TDM_ERROR_INVALID_PARAMETER); + RETURN_VAL_IF_FAIL(mode, TDM_ERROR_INVALID_PARAMETER); + + output_data->current_mode = mode; + output_data->mode_changed = 1; + + return TDM_ERROR_NONE; +} + +tdm_error +dummy_output_get_mode(tdm_output *output, const tdm_output_mode **mode) +{ + tdm_dummy_output_data *output_data = output; + + RETURN_VAL_IF_FAIL(output_data, TDM_ERROR_INVALID_PARAMETER); + RETURN_VAL_IF_FAIL(mode, TDM_ERROR_INVALID_PARAMETER); + + *mode = output_data->current_mode; + + return TDM_ERROR_NONE; +} + +tdm_error +dummy_layer_get_capability(tdm_layer *layer, tdm_caps_layer *caps) +{ + tdm_dummy_layer_data *layer_data = layer; + + RETURN_VAL_IF_FAIL(layer_data, TDM_ERROR_INVALID_PARAMETER); + RETURN_VAL_IF_FAIL(caps, TDM_ERROR_INVALID_PARAMETER); + + memset(caps, 0, sizeof(tdm_caps_layer)); + + caps->capabilities = layer_data->capabilities; + caps->zpos = layer_data->zpos; + + caps->format_count = 2; + caps->formats = calloc(caps->format_count, sizeof(tbm_format)); + if (!caps->formats) { + TDM_ERR("alloc failed\n"); + free(caps->formats); + memset(caps, 0, sizeof(tdm_caps_layer)); + return TDM_ERROR_OUT_OF_MEMORY; + } + + caps->formats[0] = TBM_FORMAT_ARGB8888; + caps->formats[1] = TBM_FORMAT_XRGB8888; + + caps->prop_count = 0; + + return TDM_ERROR_NONE; +} + +tdm_error +dummy_layer_set_info(tdm_layer *layer, tdm_info_layer *info) +{ + tdm_dummy_layer_data *layer_data = layer; + + RETURN_VAL_IF_FAIL(layer_data, TDM_ERROR_INVALID_PARAMETER); + RETURN_VAL_IF_FAIL(info, TDM_ERROR_INVALID_PARAMETER); + + layer_data->info = *info; + layer_data->info_changed = 1; + + return TDM_ERROR_NONE; +} + +tdm_error +dummy_layer_get_info(tdm_layer *layer, tdm_info_layer *info) +{ + tdm_dummy_layer_data *layer_data = layer; + + RETURN_VAL_IF_FAIL(layer_data, TDM_ERROR_INVALID_PARAMETER); + RETURN_VAL_IF_FAIL(info, TDM_ERROR_INVALID_PARAMETER); + + *info = layer_data->info; + + return TDM_ERROR_NONE; +} + +tdm_error +dummy_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer) +{ + tdm_dummy_layer_data *layer_data = layer; + + RETURN_VAL_IF_FAIL(layer_data, TDM_ERROR_INVALID_PARAMETER); + RETURN_VAL_IF_FAIL(buffer, TDM_ERROR_INVALID_PARAMETER); + + layer_data->display_buffer = buffer; + layer_data->display_buffer_changed = 1; + + return TDM_ERROR_NONE; +} + +tdm_error +dummy_layer_unset_buffer(tdm_layer *layer) +{ + tdm_dummy_layer_data *layer_data = layer; + + RETURN_VAL_IF_FAIL(layer_data, TDM_ERROR_INVALID_PARAMETER); + + layer_data->display_buffer = NULL; + layer_data->display_buffer_changed = 1; + + return TDM_ERROR_NONE; +} diff --git a/configure.ac b/configure.ac index a4cb6b8..40a3816 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,7 @@ AC_ARG_WITH(tdm-module-path, AS_HELP_STRING([--with-tdm-module-path=PATH], [tdm [ TDM_MODULE_PATH="$withval" ], [ TDM_MODULE_PATH="${DEFAULT_TDM_MODULE_PATH}" ]) AC_DEFINE_UNQUOTED(TDM_MODULE_PATH, "${TDM_MODULE_PATH}", [Directory for the modules of tdm]) +AC_SUBST(TDM_MODULE_PATH) AC_SUBST([TDM_MAJOR_VERSION], [tdm_major_version]) AC_SUBST([TDM_MINOR_VERSION], [tdm_minor_version]) @@ -89,6 +90,8 @@ AC_OUTPUT([ protocol/Makefile common/Makefile src/Makefile + backends/Makefile + backends/dummy/Makefile client/libtdm-client.pc client/Makefile tools/Makefile diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec index 32c0e1c..60fd5ed 100644 --- a/packaging/libtdm.spec +++ b/packaging/libtdm.spec @@ -101,6 +101,7 @@ rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path %defattr(-,root,root,-) %license COPYING %{_libdir}/libtdm.so.* +%{_libdir}/tdm/libtdm-dummy.so %attr(750,root,root) %{_bindir}/tdm-monitor %{_unitdir_user}/tdm-socket-user.path %{_unitdir_user}/tdm-socket-user.service -- 2.7.4 From bd5f11a1123f3974242c490a0a6d2aa166ab3688 Mon Sep 17 00:00:00 2001 From: Junkyeong Kim Date: Mon, 18 Sep 2017 15:39:48 +0900 Subject: [PATCH 06/16] do not execute wl_resource_get_client Change-Id: If9f9f636c9b1206943d4f6644d65ada660f64397 Signed-off-by: Junkyeong Kim --- src/tdm_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tdm_server.c b/src/tdm_server.c index a8f7175..d528c10 100644 --- a/src/tdm_server.c +++ b/src/tdm_server.c @@ -651,7 +651,7 @@ _tdm_server_cb_debug(struct wl_client *client, struct wl_resource *resource, con size = sizeof(message) - len; m = message; - wl_client_flush(wl_resource_get_client(resource)); + wl_client_flush(client); while (size > 0) { char buffer[TDM_DEBUG_REPLY_MSG_LEN]; -- 2.7.4 From 712c798e9c572a356d38c8b4f03bfaf380d620ae Mon Sep 17 00:00:00 2001 From: Boram Park Date: Fri, 15 Sep 2017 18:54:52 +0900 Subject: [PATCH 07/16] not using setenv, getenv for drm fd Change-Id: I2557864152f310fc10b4bd9f0d26032720dba396 --- include/tdm_helper.h | 8 ------ src/tdm_helper.c | 70 ++++------------------------------------------------ 2 files changed, 5 insertions(+), 73 deletions(-) diff --git a/include/tdm_helper.h b/include/tdm_helper.h index 1459e72..3d1d252 100644 --- a/include/tdm_helper.h +++ b/include/tdm_helper.h @@ -144,10 +144,6 @@ tdm_helper_convert_buffer(tbm_surface_h srcbuf, tbm_surface_h dstbuf, * @details * This function will dup the fd of the given enviroment variable. The Caller * @b SHOULD close the fd. - * \n - * In DRM system, a drm-master-fd @b SHOULD be shared between TDM backend and - * TBM backend in display server side by using "TDM_DRM_MASTER_FD" - * and "TBM_DRM_MASTER_FD". * @param[in] env The given enviroment variable * @return fd if success. Otherwise, -1. * @see #tdm_helper_set_fd() @@ -156,10 +152,6 @@ int tdm_helper_get_fd(const char *env); /** * @brief Set the given fd to the give enviroment variable. - * @details - * In DRM system, a drm-master-fd @b SHOULD be shared between TDM backend and - * TBM backend in display server side by using "TDM_DRM_MASTER_FD" - * and "TBM_DRM_MASTER_FD". * @param[in] env The given enviroment variable * @param[in] fd The given fd * @see #tdm_helper_get_fd() diff --git a/src/tdm_helper.c b/src/tdm_helper.c index fc271fb..b8e0d1b 100644 --- a/src/tdm_helper.c +++ b/src/tdm_helper.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -580,79 +581,18 @@ unmap_srcbuf: EXTERN int tdm_helper_get_fd(const char *env) { - const char *value; - int fd, newfd, flags, ret; - char *end; - errno = 0; - - value = (const char*)getenv(env); - if (!value) - return -1; - - const long int sl = strtol(value, &end, 10); - if (end == value) { - TDM_ERR("%s: not a decimal number\n", value); - return -1; - } else if (*end != '\0') { - TDM_ERR("%s: extra characters at end of input: %s\n", value, end); - return -1; - } else if ((sl == LONG_MIN || sl == LONG_MAX) && errno == ERANGE) { - TDM_ERR("%s out of range of type long\n", value); - return -1; - } else if (sl >= INT_MAX) { - TDM_ERR("%ld greater than INT_MAX\n", sl); - return -1; - } else if (sl <= INT_MIN) { - TDM_ERR("%ld less than INT_MIN\n", sl); - return -1; - } else { - fd = (int)sl; - if (fd < 0) { - TDM_ERR("%d out of fd range\n", fd); - return -1; - } - } - - flags = fcntl(fd, F_GETFD); - if (flags == -1) { - TDM_ERR("fcntl failed: %m"); + if (strncmp(env, "TBM_DRM_MASTER_FD", 17) && strncmp(env, "TDM_DRM_MASTER_FD", 17)) { + TDM_INFO("DEPRECATED! '%s'", env); return -1; } - newfd = dup(fd); - if (newfd < 0) { - TDM_ERR("dup failed: %m"); - return -1; - } - - TDM_INFO("%s: fd(%d) newfd(%d)", env, fd, newfd); - - ret = fcntl(newfd, F_SETFD, flags | FD_CLOEXEC); - if (ret == -1) { - TDM_ERR("fcntl failed: %m"); - close(newfd); - return -1; - } - - return newfd; + return tbm_drm_helper_get_master_fd(); } EXTERN void tdm_helper_set_fd(const char *env, int fd) { - char buf[32]; - int ret; - - snprintf(buf, sizeof(buf), "%d", fd); - - ret = setenv(env, (const char*)buf, 1); - if (ret) { - TDM_ERR("setenv failed: %m"); - return; - } - - if (fd >= 0) - TDM_INFO("%s: fd(%d)", env, fd); + TDM_INFO("DEPRECATED!"); } EXTERN void -- 2.7.4 From f00c5a0988a6cae11042bfbedca88257650f5ee9 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Fri, 22 Sep 2017 10:46:16 +0900 Subject: [PATCH 08/16] layer: pending layer's data until committed The layer's info and buffer information should be applied when tdm_layer_commit called. Otherwise, when we call tdm_layer_commit for A layer, the changes of B layer can be applied to backend unintentionally. Change-Id: I5cfdde9ed9f918174aa5a0785bad48c93c4b2091 --- src/tdm_layer.c | 119 ++++++++++++++++++++++++++++++++++++++++++------------ src/tdm_output.c | 7 ++++ src/tdm_private.h | 8 ++++ 3 files changed, 109 insertions(+), 25 deletions(-) diff --git a/src/tdm_layer.c b/src/tdm_layer.c index c6128a8..ea30779 100644 --- a/src/tdm_layer.c +++ b/src/tdm_layer.c @@ -81,6 +81,7 @@ static void _tbm_layer_queue_acquirable_cb(tbm_surface_queue_h surface_queue, vo static void _tbm_layer_queue_destroy_cb(tbm_surface_queue_h surface_queue, void *data); static void _tdm_layer_cb_output_commit(tdm_output *output, unsigned int sequence, unsigned int tv_sec, unsigned int tv_usec, void *user_data); +static void _tdm_layer_reset_pending_data(tdm_private_layer *private_layer); EXTERN tdm_error tdm_layer_get_capabilities(tdm_layer *layer, tdm_layer_capability *capabilities) @@ -242,8 +243,8 @@ tdm_layer_set_info(tdm_layer *layer, tdm_info_layer *info) info->dst_pos.w, info->dst_pos.h, info->transform); - ret = func_layer->layer_set_info(private_layer->layer_backend, info); - TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); + private_layer->pending_info_changed = 1; + private_layer->pending_info = *info; _pthread_mutex_unlock(&private_display->lock); @@ -335,6 +336,8 @@ _tdm_layer_free_all_buffers(tdm_private_layer *private_layer) LIST_INITHEAD(&clone_list); + _tdm_layer_reset_pending_data(private_layer); + if (private_layer->waiting_buffer) { _tdm_layer_free_buffer(private_layer, private_layer->waiting_buffer); private_layer->waiting_buffer = NULL; @@ -400,7 +403,6 @@ EXTERN tdm_error tdm_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer) { tdm_func_layer *func_layer; - tdm_private_layer_buffer *layer_buffer; LAYER_FUNC_ENTRY(); @@ -430,32 +432,22 @@ tdm_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer) return TDM_ERROR_NOT_IMPLEMENTED; } - layer_buffer = calloc(1, sizeof(tdm_private_layer_buffer)); - if (!layer_buffer) { - _pthread_mutex_unlock(&private_display->lock); - TDM_ERR("alloc failed"); - return TDM_ERROR_OUT_OF_MEMORY; - } - LIST_INITHEAD(&layer_buffer->link); + private_layer->pending_buffer_changed = 1; - ret = func_layer->layer_set_buffer(private_layer->layer_backend, buffer); - TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); + if (private_layer->pending_buffer) { + tbm_surface_internal_unref(private_layer->pending_buffer); - /* dump buffer */ - if (tdm_dump_enable && !(private_layer->caps.capabilities & TDM_LAYER_CAPABILITY_VIDEO)) - _tdm_layer_dump_buffer(layer, buffer); + if (tdm_debug_module & TDM_DEBUG_BUFFER) + TDM_INFO("layer(%p) pending_buffer(%p) skipped", + private_layer, private_layer->pending_buffer); + } - if (ret == TDM_ERROR_NONE) { - if (private_layer->waiting_buffer) - _tdm_layer_free_buffer(private_layer, private_layer->waiting_buffer); + tbm_surface_internal_ref(buffer); + private_layer->pending_buffer = buffer; - private_layer->waiting_buffer = layer_buffer; - private_layer->waiting_buffer->buffer = tdm_buffer_ref_backend(buffer); - if (tdm_debug_module & TDM_DEBUG_BUFFER) - TDM_INFO("layer(%p) waiting_buffer(%p)", - private_layer, private_layer->waiting_buffer->buffer); - } else - _tdm_layer_free_buffer(private_layer, layer_buffer); + if (tdm_debug_module & TDM_DEBUG_BUFFER) + TDM_INFO("layer(%p) pending_buffer(%p)", + private_layer, private_layer->pending_buffer); _pthread_mutex_unlock(&private_display->lock); @@ -745,6 +737,72 @@ _tdm_layer_commit_possible(tdm_private_layer *private_layer) return 1; } +static void +_tdm_layer_reset_pending_data(tdm_private_layer *private_layer) +{ + private_layer->pending_info_changed = 0; + memset(&private_layer->pending_info, 0, sizeof private_layer->pending_info); + + private_layer->pending_buffer_changed = 0; + if (private_layer->pending_buffer) { + tbm_surface_internal_unref(private_layer->pending_buffer); + private_layer->pending_buffer = NULL; + } +} + +INTERN tdm_error +tdm_layer_commit_pending_data(tdm_private_layer *private_layer) +{ + tdm_private_output *private_output = private_layer->private_output; + tdm_private_display *private_display = private_output->private_display; + tdm_func_layer *func_layer; + tdm_error ret = TDM_ERROR_NONE; + + func_layer = &private_display->func_layer; + + if (private_layer->pending_info_changed) { + ret = func_layer->layer_set_info(private_layer->layer_backend, &private_layer->pending_info); + TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, done); + } + + if (private_layer->pending_buffer_changed) { + tdm_private_layer_buffer *layer_buffer; + + layer_buffer = calloc(1, sizeof(tdm_private_layer_buffer)); + TDM_GOTO_IF_FAIL(layer_buffer != NULL, done); + + LIST_INITHEAD(&layer_buffer->link); + + ret = func_layer->layer_set_buffer(private_layer->layer_backend, private_layer->pending_buffer); + TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); + + if (tdm_debug_module & TDM_DEBUG_BUFFER) + TDM_INFO("layer(%p) pending_buffer(%p) committed", + private_layer, private_layer->pending_buffer); + + /* dump buffer */ + if (tdm_dump_enable && !(private_layer->caps.capabilities & TDM_LAYER_CAPABILITY_VIDEO)) + _tdm_layer_dump_buffer(private_layer, private_layer->pending_buffer); + + if (ret == TDM_ERROR_NONE) { + if (private_layer->waiting_buffer) + _tdm_layer_free_buffer(private_layer, private_layer->waiting_buffer); + + private_layer->waiting_buffer = layer_buffer; + private_layer->waiting_buffer->buffer = tdm_buffer_ref_backend(private_layer->pending_buffer); + if (tdm_debug_module & TDM_DEBUG_BUFFER) + TDM_INFO("layer(%p) waiting_buffer(%p)", + private_layer, private_layer->waiting_buffer->buffer); + } else + _tdm_layer_free_buffer(private_layer, layer_buffer); + } + +done: + _tdm_layer_reset_pending_data(private_layer); + + return ret; +} + /* CAUTION: Once _tdm_layer_commit returns success, the layer commit handler MUST be called always. * That is, even if we get error in _tdm_layer_got_output_vblank() function for some reasons, * the layer commit handler MUST be called. @@ -863,6 +921,14 @@ tdm_layer_commit(tdm_layer *layer, tdm_layer_commit_handler func, void *user_dat return TDM_ERROR_DPMS_OFF; } + /* don't call this inside of _tdm_layer_commit */ + ret = tdm_layer_commit_pending_data(private_layer); + if (ret != TDM_ERROR_NONE) { + TDM_ERR("layer(%p) committing pending data failed", layer); + _pthread_mutex_unlock(&private_display->lock); + return ret; + } + ret = _tdm_layer_commit(private_layer, func, user_data); _pthread_mutex_unlock(&private_display->lock); @@ -991,6 +1057,9 @@ _tbm_layer_queue_acquirable_cb(tbm_surface_queue_h surface_queue, void *data) return; } + /* we don't need to handle pending data here because the changes in this function + * should be applied immediately. we can't expect calling tdm_layer_commit. + */ ret = func_layer->layer_set_buffer(private_layer->layer_backend, surface); TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); diff --git a/src/tdm_output.c b/src/tdm_output.c index f6d780a..b37bf4f 100644 --- a/src/tdm_output.c +++ b/src/tdm_output.c @@ -960,6 +960,8 @@ EXTERN tdm_error tdm_output_commit(tdm_output *output, int sync, tdm_output_commit_handler func, void *user_data) { + tdm_private_layer *private_layer = NULL; + OUTPUT_FUNC_ENTRY(); _pthread_mutex_lock(&private_display->lock); @@ -988,6 +990,11 @@ tdm_output_commit(tdm_output *output, int sync, tdm_output_commit_handler func, if (tdm_debug_module & TDM_DEBUG_COMMIT) TDM_INFO("output(%d) commit", private_output->pipe); + /* apply the pending data of all layers */ + LIST_FOR_EACH_ENTRY(private_layer, &private_output->layer_list, link) { + tdm_layer_commit_pending_data(private_layer); + } + ret = tdm_output_commit_internal(output, sync, func, user_data); _pthread_mutex_unlock(&private_display->lock); diff --git a/src/tdm_private.h b/src/tdm_private.h index cecf66d..522ae57 100644 --- a/src/tdm_private.h +++ b/src/tdm_private.h @@ -233,6 +233,12 @@ struct _tdm_private_layer { tdm_caps_layer caps; tdm_layer *layer_backend; + /* pending data until committed */ + unsigned int pending_info_changed; + tdm_info_layer pending_info; + unsigned int pending_buffer_changed; + tbm_surface_h pending_buffer; + /* When a buffer is set to a layer, it will be stored to waiting_buffer. * And when a layer is committed, it will be moved to committed_buffer. * Finally when a commit handler is called, it will be moved to showing_buffer. @@ -436,6 +442,8 @@ tdm_output_remove_commit_handler_internal(tdm_output *output, tdm_output_commit_ void tdm_layer_remove_commit_handler_internal(tdm_layer *layer, tdm_layer_commit_handler func, void *user_data); +tdm_error +tdm_layer_commit_pending_data(tdm_private_layer *private_layer); void tdm_layer_committed(tdm_private_layer *private_layer, tdm_private_layer_buffer **committed_buffer); -- 2.7.4 From eac2630a6cfdbc02466d0f11863c32f91e02bb42 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Fri, 22 Sep 2017 16:57:01 +0900 Subject: [PATCH 09/16] package version up to 1.8.0 Change-Id: Ib8fb6088111712c0e36e685dd351aeb2d1771488 --- packaging/libtdm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec index 60fd5ed..cb46040 100644 --- a/packaging/libtdm.spec +++ b/packaging/libtdm.spec @@ -1,7 +1,7 @@ %bcond_with utest Name: libtdm -Version: 1.7.8 +Version: 1.8.0 Release: 0 Summary: User Library of Tizen Display Manager Group: Development/Libraries -- 2.7.4 From 2980da18ae3a442dd7cbce9b085a3acd87e06c93 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Wed, 27 Sep 2017 10:31:16 +0900 Subject: [PATCH 10/16] remove unnecessary condition Change-Id: Ib27a298da0b3194c1f42feca95739f53f4e05bb1 --- client/tdm_monitor.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/client/tdm_monitor.c b/client/tdm_monitor.c index cdfa1f7..60ce16d 100644 --- a/client/tdm_monitor.c +++ b/client/tdm_monitor.c @@ -164,12 +164,9 @@ main(int argc, char ** argv) while (!info->debug.done && ret >= 0) ret = wl_display_dispatch(info->display); - if (info->tdm) - wl_tdm_destroy(info->tdm); - if (info->registry) - wl_registry_destroy(info->registry); - if (info->display) - wl_display_disconnect(info->display); + wl_tdm_destroy(info->tdm); + wl_registry_destroy(info->registry); + wl_display_disconnect(info->display); return 0; } -- 2.7.4 From 3f859445a835fd5d7958272363095313931b6cce Mon Sep 17 00:00:00 2001 From: Boram Park Date: Wed, 27 Sep 2017 10:32:30 +0900 Subject: [PATCH 11/16] add validation check for getenv Change-Id: I88df5bdfeb5049b0ba3c84fb841a9d062a9c01d9 --- src/tdm.c | 18 +++++++++++++++--- src/tdm_server.c | 7 ++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/tdm.c b/src/tdm.c index a27247b..d942f3a 100644 --- a/src/tdm.c +++ b/src/tdm.c @@ -773,8 +773,13 @@ _tdm_display_load_module_with_file(tdm_private_display *private_display, void *module; tdm_error ret; double stamp; + int size; - snprintf(path, sizeof(path), TDM_MODULE_PATH "/%s", file); + size = snprintf(path, sizeof(path), TDM_MODULE_PATH "/%s", file); + if (size >= (int)sizeof(path)) { + TDM_WRN("too long: %s/%s", TDM_MODULE_PATH, file); + return TDM_ERROR_BAD_MODULE; + }; stamp = tdm_helper_get_time(); TDM_TRACE_BEGIN(Load_Backend); @@ -839,16 +844,23 @@ static tdm_error _tdm_display_load_module(tdm_private_display *private_display) { const char *module_name; + char module[TDM_NAME_LEN]; struct dirent **namelist; - int n; + int n, size; tdm_error ret = 0; module_name = getenv("TDM_MODULE"); if (!module_name) module_name = TDM_DEFAULT_MODULE; + size = snprintf(module, sizeof(module), "%s", module_name); + if (size >= (int)sizeof(module)) { + TDM_ERR("too long: %s", module_name); + return TDM_ERROR_OPERATION_FAILED; + }; + /* load bufmgr priv from default lib */ - ret = _tdm_display_load_module_with_file(private_display, module_name); + ret = _tdm_display_load_module_with_file(private_display, (const char*)module); if (ret == TDM_ERROR_NONE) return TDM_ERROR_NONE; diff --git a/src/tdm_server.c b/src/tdm_server.c index d528c10..21c0c9d 100644 --- a/src/tdm_server.c +++ b/src/tdm_server.c @@ -790,6 +790,7 @@ _tdm_socket_init(tdm_private_loop *private_loop) { const char *dir = NULL; char socket_path[128]; + int size; int ret = -1; uid_t uid; gid_t gid; @@ -800,7 +801,11 @@ _tdm_socket_init(tdm_private_loop *private_loop) return; } - snprintf(socket_path, sizeof(socket_path), "%s/%s", dir, "tdm-socket"); + size = snprintf(socket_path, sizeof(socket_path), "%s/%s", dir, "tdm-socket"); + if (size >= (int)sizeof(socket_path)) { + TDM_WRN("too long: %s/tdm-socket", dir); + return; + }; ret = chmod(socket_path, 509); if (ret < 0) { -- 2.7.4 From 6323735bc3dbab2defe7920e087ce21687c55b5a Mon Sep 17 00:00:00 2001 From: Boram Park Date: Wed, 27 Sep 2017 15:39:30 +0900 Subject: [PATCH 12/16] package version up to 1.8.1 Change-Id: I7744c6b4582f0e5f3dde7a09bcb15ea0ec8d1d3e --- packaging/libtdm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec index cb46040..fb8effa 100644 --- a/packaging/libtdm.spec +++ b/packaging/libtdm.spec @@ -1,7 +1,7 @@ %bcond_with utest Name: libtdm -Version: 1.8.0 +Version: 1.8.1 Release: 0 Summary: User Library of Tizen Display Manager Group: Development/Libraries -- 2.7.4 From ea5d8b69554417c15440caaf500710b2adf85657 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Wed, 27 Sep 2017 17:37:21 +0900 Subject: [PATCH 13/16] set drm_fd to tbm Change-Id: If4e231b807744f14621dfb4ccc710191b6d09aab --- src/tdm_helper.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/tdm_helper.c b/src/tdm_helper.c index b8e0d1b..a22e0cc 100644 --- a/src/tdm_helper.c +++ b/src/tdm_helper.c @@ -592,7 +592,12 @@ tdm_helper_get_fd(const char *env) EXTERN void tdm_helper_set_fd(const char *env, int fd) { - TDM_INFO("DEPRECATED!"); + if (strncmp(env, "TBM_DRM_MASTER_FD", 17) && strncmp(env, "TDM_DRM_MASTER_FD", 17)) { + TDM_INFO("DEPRECATED! '%s'", env); + return; + } + + tbm_drm_helper_set_tbm_master_fd(fd); } EXTERN void -- 2.7.4 From d3f88ed1621fe5faa747ae128a0b1788c1d027a2 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Fri, 29 Sep 2017 11:28:54 +0900 Subject: [PATCH 14/16] Revert "implementation for SCREEN_PREROTATION_HINT" This reverts commit f4aa0253c0f401b86bf1769e200b216cd2d8b66d. Change-Id: Ic15d3a1815bbf9eab57240cc50514c9937bcf662 --- tools/tdm_test_server.c | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/tools/tdm_test_server.c b/tools/tdm_test_server.c index 0c30519..b42a0fb 100644 --- a/tools/tdm_test_server.c +++ b/tools/tdm_test_server.c @@ -760,7 +760,6 @@ interpret_args(tdm_test_server *data) } } -static unsigned int tts_screen_prerotation_hint; static tdm_test_server tts_data; static int tts_buffer_key; #define TTS_BUFFER_KEY ((unsigned long)&tts_buffer_key) @@ -770,8 +769,6 @@ buffer_allocate(int width, int height, int format, int flags) { tdm_test_server_buffer *tb = calloc(1, sizeof *tb); TDM_EXIT_IF_FAIL(tb != NULL); - if (tts_screen_prerotation_hint % 180) - TDM_SWAP(width, height); tb->b = tbm_surface_internal_create_with_flags(width, height, format, flags); TDM_EXIT_IF_FAIL(tb->b != NULL); tdm_helper_clear_buffer(tb->b); @@ -859,14 +856,6 @@ main(int argc, char *argv[]) char temp[TDM_SERVER_REPLY_MSG_LEN]; int len = sizeof temp; tdm_error ret; - const char *value; - - value = (const char*)getenv("SCREEN_PREROTATION_HINT"); - if (value) { - char *end; - tts_screen_prerotation_hint = strtol(value, &end, 10); - printf("SCREEN_PREROTATION_HINT = %d", tts_screen_prerotation_hint); - } memset(data, 0, sizeof * data); LIST_INITHEAD(&data->output_list); @@ -1054,22 +1043,12 @@ layer_setup(tdm_test_server_layer *l, tbm_surface_h b) /* The size and format information should be same with buffer's */ tbm_surface_get_info(b, &info); - if (tts_screen_prerotation_hint % 180) { - if (IS_RGB(info.format)) { - l->info.src_config.size.h = info.height; - l->info.src_config.size.v = info.planes[0].stride >> 2; - } else { - l->info.src_config.size.h = info.height; - l->info.src_config.size.v = info.planes[0].stride; - } + if (IS_RGB(info.format)) { + l->info.src_config.size.h = info.planes[0].stride >> 2; + l->info.src_config.size.v = info.height; } else { - if (IS_RGB(info.format)) { - l->info.src_config.size.h = info.planes[0].stride >> 2; - l->info.src_config.size.v = info.height; - } else { - l->info.src_config.size.h = info.planes[0].stride; - l->info.src_config.size.v = info.height; - } + l->info.src_config.size.h = info.planes[0].stride; + l->info.src_config.size.v = info.height; } l->info.src_config.format = info.format; -- 2.7.4 From 313aa28db9eb590c553779645debbfd577ad6599 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Fri, 29 Sep 2017 11:39:40 +0900 Subject: [PATCH 15/16] test: set enviroment for testing Change-Id: I0fdd86a9c15e33b25eaf1fa0482c94472f4b025b --- tools/tdm_test_server.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/tdm_test_server.c b/tools/tdm_test_server.c index b42a0fb..ff7b542 100644 --- a/tools/tdm_test_server.c +++ b/tools/tdm_test_server.c @@ -857,6 +857,26 @@ main(int argc, char *argv[]) int len = sizeof temp; tdm_error ret; +#if 1 /* for testing */ + const char *s = (const char*)getenv("XDG_RUNTIME_DIR"); + if (!s) { + char buf[32]; + snprintf(buf, sizeof(buf), "/run"); + int ret = setenv("XDG_RUNTIME_DIR", (const char*)buf, 1); + if (ret != 0) + exit(0); + } + + s = (const char*)getenv("TBM_DISPLAY_SERVER"); + if (!s) { + char buf[32]; + snprintf(buf, sizeof(buf), "1"); + int ret = setenv("TBM_DISPLAY_SERVER", (const char*)buf, 1); + if (ret != 0) + exit(0); + } +#endif + memset(data, 0, sizeof * data); LIST_INITHEAD(&data->output_list); LIST_INITHEAD(&data->pp_list); -- 2.7.4 From 7252950fc1c0a6a39058a9046dabb619196fca22 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Fri, 29 Sep 2017 14:08:45 +0900 Subject: [PATCH 16/16] remove link before calling the user handler Inside of the user handler, list can be changed. And it could make crash. Change-Id: Ib49bc110e826ff7b34b6c8bc2224b5006b1972ba --- src/tdm_layer.c | 3 ++- src/tdm_output.c | 7 +++++-- src/tdm_server.c | 6 ++++-- src/tdm_vblank.c | 5 +++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/tdm_layer.c b/src/tdm_layer.c index ea30779..cb4ef55 100644 --- a/src/tdm_layer.c +++ b/src/tdm_layer.c @@ -644,6 +644,8 @@ _tdm_layer_cb_output_commit(tdm_output *output, unsigned int sequence, if (!found) return; + LIST_DEL(&layer_commit_handler->link); + private_layer = layer_commit_handler->private_layer; if (tdm_debug_module & TDM_DEBUG_COMMIT) @@ -661,7 +663,6 @@ _tdm_layer_cb_output_commit(tdm_output *output, unsigned int sequence, _pthread_mutex_lock(&private_display->lock); } - LIST_DEL(&layer_commit_handler->link); free(layer_commit_handler); _pthread_mutex_unlock(&private_display->lock); diff --git a/src/tdm_output.c b/src/tdm_output.c index b37bf4f..2374a36 100644 --- a/src/tdm_output.c +++ b/src/tdm_output.c @@ -605,9 +605,11 @@ tdm_output_cb_vblank(tdm_output *output_backend, unsigned int sequence, if (tdm_debug_module & TDM_DEBUG_COMMIT) TDM_INFO("handler(%p)", v); + LIST_DEL(&v->link); + if (v->func) v->func(v->private_output, sequence, tv_sec, tv_usec, v->user_data); - LIST_DEL(&v->link); + free(v); } _pthread_mutex_lock(&private_display->lock); @@ -651,6 +653,8 @@ tdm_output_cb_commit(tdm_output *output_backend, unsigned int sequence, return; } + LIST_DEL(&output_commit_handler->link); + if (tdm_debug_module & TDM_DEBUG_COMMIT) { TDM_INFO("----------------------------------------- output(%d) committed", private_output->pipe); TDM_INFO("handler(%p)", output_commit_handler); @@ -671,7 +675,6 @@ tdm_output_cb_commit(tdm_output *output_backend, unsigned int sequence, _pthread_mutex_lock(&private_display->lock); } - LIST_DEL(&output_commit_handler->link); free(output_commit_handler); if (tdm_debug_module & TDM_DEBUG_COMMIT) diff --git a/src/tdm_server.c b/src/tdm_server.c index 21c0c9d..5d7159a 100644 --- a/src/tdm_server.c +++ b/src/tdm_server.c @@ -242,6 +242,8 @@ destroy_vblank_callback(struct wl_resource *resource) TDM_RETURN_IF_FAIL(vblank_info != NULL); + LIST_DEL(&vblank_info->link); + if (vblank_info->vblank) tdm_vblank_destroy(vblank_info->vblank); @@ -250,7 +252,6 @@ destroy_vblank_callback(struct wl_resource *resource) destroy_wait(w); } - LIST_DEL(&vblank_info->link); free(vblank_info); } @@ -549,6 +550,8 @@ destroy_output_callback(struct wl_resource *resource) TDM_RETURN_IF_FAIL(output_info != NULL); + LIST_DEL(&output_info->link); + tdm_output_remove_change_handler(output_info->output, _tdm_server_cb_output_change, output_info); @@ -556,7 +559,6 @@ destroy_output_callback(struct wl_resource *resource) wl_resource_destroy(v->resource); } - LIST_DEL(&output_info->link); free(output_info); } diff --git a/src/tdm_vblank.c b/src/tdm_vblank.c index 2c5eca4..931842d 100644 --- a/src/tdm_vblank.c +++ b/src/tdm_vblank.c @@ -802,6 +802,9 @@ _tdm_vblank_cb_vblank_HW(tdm_output *output, unsigned int sequence, VWR("couldn't update sw timer"); } + LIST_DEL(&wait_info->link); + _tdm_vblank_valid_list_del(&wait_info->valid_link); + /* tv_sec & tv_usec shouldn't be zero. But sometimes they are zero in some hardware. * We need to prohibit that last_time becomes zero because "last_time == 0" means * that a tdm_vblank object is just created and doesn't have the first vblank event. @@ -822,8 +825,6 @@ _tdm_vblank_cb_vblank_HW(tdm_output *output, unsigned int sequence, wait_info->func(private_vblank, TDM_ERROR_NONE, wait_info->target_seq, tv_sec, tv_usec, wait_info->user_data); - LIST_DEL(&wait_info->link); - _tdm_vblank_valid_list_del(&wait_info->valid_link); free(wait_info); } -- 2.7.4