struct list_head link;
struct wl_resource *wl_buffer;
tbm_surface_h buffer;
+ int need_reset;
} tdm_server_voutput_buffer;
typedef struct _tdm_server_voutput_info {
struct list_head buffer_list;
tdm_server_voutput_buffer *attach_buffer;
int committing;
+ unsigned int request_commit;
} tdm_server_voutput_info;
typedef struct _tdm_server_vblank_info {
tdm_vblank *vblank;
unsigned int stamp;
+
+ /* for timeout */
+ tdm_event_loop_source *vblank_timeout_timer;
} tdm_server_vblank_info;
typedef struct _tdm_server_wait_info {
unsigned int req_id;
double req_time;
+
+ unsigned int timeout;
} tdm_server_wait_info;
typedef struct _tdm_server_client_info {
static struct list_head client_list;
static void destroy_wait(tdm_server_wait_info *wait_info);
+static void _tdm_server_vblank_timeout_update(tdm_server_vblank_info *vblank_info, int ms_delay);
static void
_tdm_server_get_process_name(pid_t pid, char *name, unsigned int size)
{
tdm_server_wait_info *found;
tdm_server_vblank_info *vblank_info;
+ tdm_server_output_info *output_info;
+ tdm_private_server *private_server;
+ tdm_private_loop *private_loop;
TDM_RETURN_IF_FAIL(keep_private_server != NULL);
TDM_DBG("req_id(%d) done", wait_info->req_id);
vblank_info = wait_info->vblank_info;
+ output_info = vblank_info->output_info;
+ private_server = output_info->private_server;
+ private_loop = private_server->private_loop;
+
+ tdm_display_lock(private_loop->dpy);
+ _tdm_server_vblank_timeout_update(vblank_info, 0);
+ tdm_display_unlock(private_loop->dpy);
if (tdm_ttrace_module & TDM_TTRACE_SERVER_VBLANK)
TDM_TRACE_ASYNC_END((int)wait_info->req_time, "TDM_Server_Vblank:%u", vblank_info->stamp);
- wl_tdm_vblank_send_done(vblank_info->resource, wait_info->req_id,
- sequence, tv_sec, tv_usec, error);
+ if (!wait_info->timeout)
+ wl_tdm_vblank_send_done(vblank_info->resource, wait_info->req_id,
+ sequence, tv_sec, tv_usec, error);
destroy_wait(wait_info);
}
/* LCOV_EXCL_STOP */
/* LCOV_EXCL_START */
+static tdm_error
+_tdm_server_timeout_timer_cb(void *user_data)
+{
+ tdm_server_vblank_info *vblank_info = user_data;
+ tdm_server_wait_info *wait_info = NULL;
+ double curr;
+ unsigned int tv_sec;
+ unsigned int tv_usec;
+
+ TDM_RETURN_VAL_IF_FAIL(vblank_info != NULL, TDM_ERROR_OPERATION_FAILED);
+ TDM_RETURN_VAL_IF_FAIL(keep_private_server != NULL, TDM_ERROR_OPERATION_FAILED);
+
+ curr = tdm_helper_get_time();
+ tv_sec = TDM_TIME_SEC(curr);
+ tv_usec = TDM_TIME_USEC(curr);
+
+ LIST_FOR_EACH_ENTRY(wait_info, &keep_private_server->wait_list, link) {
+ if (wait_info->timeout) continue;
+ if (vblank_info != wait_info->vblank_info) continue;
+
+ wl_tdm_vblank_send_done(vblank_info->resource, wait_info->req_id,
+ 0, tv_sec, tv_usec, TDM_ERROR_TIMEOUT);
+ TDM_ERR("tdm_server_vblank(%p) req_id(%d) timeout force send vblank", vblank_info, wait_info->req_id);
+ wait_info->timeout = 1;
+ }
+
+ return TDM_ERROR_NONE;
+}
+
+static void
+_tdm_server_vblank_timeout_update(tdm_server_vblank_info *vblank_info, int ms_delay)
+{
+ tdm_server_output_info *output_info = vblank_info->output_info;
+ tdm_private_server *private_server = output_info->private_server;
+ tdm_private_loop *private_loop = private_server->private_loop;
+ tdm_error ret;
+
+ if (!vblank_info->vblank_timeout_timer) {
+ vblank_info->vblank_timeout_timer =
+ tdm_event_loop_add_timer_handler(private_loop->dpy,
+ _tdm_server_timeout_timer_cb,
+ vblank_info,
+ &ret);
+ if (!vblank_info->vblank_timeout_timer) {
+ TDM_ERR("tdm_server_vblank(%p) couldn't add timer", vblank_info);
+ return;
+ }
+
+ if (tdm_debug_module & TDM_DEBUG_VBLANK)
+ TDM_INFO("tdm_server_vblank(%p) create vblank timeout timer", vblank_info);
+ }
+
+ ret = tdm_event_loop_source_timer_update(vblank_info->vblank_timeout_timer, ms_delay);
+ if (ret != TDM_ERROR_NONE) {
+ TDM_ERR("tdm_server_vblank(%p) couldn't update timer", vblank_info);
+ return;
+ }
+}
+
static void
_tdm_server_cb_vblank(tdm_vblank *vblank, tdm_error error, unsigned int sequence,
unsigned int tv_sec, unsigned int tv_usec, void *user_data)
destroy_vblank_callback(struct wl_resource *resource)
{
tdm_server_vblank_info *vblank_info = wl_resource_get_user_data(resource);
+ tdm_server_output_info *output_info = vblank_info->output_info;
+ tdm_private_server *private_server = output_info->private_server;
+ tdm_private_loop *private_loop = private_server->private_loop;
tdm_server_wait_info *w = NULL, *ww = NULL;
TDM_RETURN_IF_FAIL(vblank_info != NULL);
+ if (vblank_info->vblank_timeout_timer) {
+ tdm_display_lock(private_loop->dpy);
+ tdm_event_loop_source_remove(vblank_info->vblank_timeout_timer);
+ tdm_display_unlock(private_loop->dpy);
+ }
+
LIST_DEL(&vblank_info->link);
if (vblank_info->vblank)
tdm_server_vblank_info *vblank_info = wl_resource_get_user_data(resource);
tdm_server_output_info *output_info = vblank_info->output_info;
tdm_private_server *private_server = output_info->private_server;
+ tdm_private_loop *private_loop = private_server->private_loop;
tdm_server_wait_info *wait_info;
unsigned int enable_fake = 0;
tdm_error ret;
TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, wait_failed);
+ tdm_display_lock(private_loop->dpy);
+ _tdm_server_vblank_timeout_update(vblank_info, 1000);
+ tdm_display_unlock(private_loop->dpy);
+
return;
wait_failed:
/* LCOV_EXCL_START */
tdm_server_voutput_info *voutput_info = NULL;
tdm_output *output = NULL;
tdm_output_conn_status status = TDM_OUTPUT_CONN_STATUS_DISCONNECTED;
- const tdm_output_mode *modes, *mode;
-
+ const tdm_output_mode *modes, *mode, *current_mode;
+ tdm_server_voutput_buffer *vb = NULL, *vbb = NULL;
int count = 0;
tdm_error ret;
mode = &modes[index];
TDM_DBG("mode set request to index:%d (%dx%d, %d)", index, mode->hdisplay, mode->vdisplay, mode->vrefresh);
- ret = tdm_output_set_mode(output, mode);
+ ret = tdm_output_get_mode(output, ¤t_mode);
TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
+ if (mode == current_mode) {
+ TDM_DBG("same mode");
+ return;
+ }
+
+ if (current_mode && ((mode->hdisplay != current_mode->hdisplay) || (mode->vdisplay != current_mode->vdisplay))) {
+ LIST_FOR_EACH_ENTRY_SAFE(vb, vbb, &voutput_info->buffer_list, link) {
+ if (vb->wl_buffer == voutput_info->attach_buffer->wl_buffer)
+ voutput_info->attach_buffer->need_reset = 1;
+ else
+ wl_tdm_voutput_send_destroy_buffer(voutput_info->resource, vb->wl_buffer);
+ }
+ }
tdm_output_request_mode_set(voutput_info->output, index);
}
voutput_info = wl_resource_get_user_data(resource);
voutput_info->status = TDM_OUTPUT_CONN_STATUS_CONNECTED;
+ voutput_info->request_commit = 1;
+
tdm_voutput_set_physical_size(voutput_info->voutput, voutput_info->mmwidth, voutput_info->mmheight);
tdm_voutput_set_available_mode(voutput_info->voutput, voutput_info->available_modes.modes, voutput_info->available_modes.count);
tdm_voutput_connect(voutput_info->voutput);
+ tdm_output_set_voutput_commit(voutput_info->voutput);
}
static void
voutput_info->mmwidth = 0;
voutput_info->mmheight = 0;
+ if (voutput_info->request_commit == 1) {
+ tdm_output_unset_voutput_commit(voutput_info->voutput);
+ voutput_info->request_commit = 0;
+ }
+
if (voutput_info->attach_buffer) {
tbm_surface_h buffer = voutput_info->attach_buffer->buffer;
tbm_surface_internal_unref(buffer);
voutput_info->committing = 0;
+ if (voutput_info->attach_buffer->need_reset)
+ wl_tdm_voutput_send_destroy_buffer(voutput_info->resource, voutput_info->attach_buffer->wl_buffer);
voutput_info->attach_buffer = NULL;
+ tdm_voutput_commit_done(voutput_info->voutput);
}
tdm_voutput_disconnect(voutput_info->voutput);
buffer = voutput_info->attach_buffer->buffer;
tbm_surface_internal_unref(buffer);
voutput_info->committing = 0;
+ if (voutput_info->attach_buffer->need_reset)
+ wl_tdm_voutput_send_destroy_buffer(voutput_info->resource, voutput_info->attach_buffer->wl_buffer);
voutput_info->attach_buffer = NULL;
+ if (voutput_info->request_commit == 1)
+ tdm_output_set_voutput_commit(voutput_info->voutput);
+
tdm_voutput_commit_done(voutput_info->voutput);
}
LIST_FOR_EACH_ENTRY(vb, &voutput_info->buffer_list, link) {
if (vb && vb->buffer == buffer) {
- tbm_surface_internal_ref(vb->buffer);
return vb;
}
}
voutput_info->attach_buffer = voutput_buffer;
+ tbm_surface_internal_ref(buffer);
wl_tdm_voutput_send_attach_buffer(voutput_info->resource, voutput_buffer->wl_buffer);
return TDM_ERROR_NONE;
TDM_RETURN_VAL_IF_FAIL(voutput_info->attach_buffer != NULL, TDM_ERROR_OPERATION_FAILED);
TDM_RETURN_VAL_IF_FAIL(voutput_info->committing == 0, TDM_ERROR_OPERATION_FAILED);
- tbm_surface_internal_ref(voutput_info->attach_buffer->buffer);
voutput_info->committing = 1;
wl_tdm_voutput_send_commit(voutput_info->resource);
tdm_voutput_cb_resource_destroy(struct wl_resource *resource)
{
tdm_server_voutput_info *voutput_info = wl_resource_get_user_data(resource);
- tdm_server_voutput_buffer *vb;
+ tdm_server_voutput_buffer *vb = NULL;
tdm_voutput *voutput;
tdm_error ret = TDM_ERROR_NONE;
voutput = voutput_info->voutput;
- if (voutput)
+ if (voutput_info->request_commit)
+ tdm_output_unset_voutput_commit(voutput_info->voutput);
+
+ if (voutput) {
+ if (voutput_info->request_commit == 1) {
+ tdm_output_unset_voutput_commit(voutput_info->voutput);
+ voutput_info->request_commit = 0;
+ tdm_voutput_disconnect(voutput_info->voutput);
+ }
+
ret = tdm_voutput_destroy(voutput);
- if (ret != TDM_ERROR_NONE)
- TDM_ERR("_tdm_voutput_cb_destroy fail");
+ if (ret != TDM_ERROR_NONE)
+ TDM_ERR("_tdm_voutput_cb_destroy fail");
+ }
if (voutput_info->attach_buffer) {
tbm_surface_h buffer = voutput_info->attach_buffer->buffer;
projects / platform / core / uifw / libtdm.git / blobdiff