common: remove unuseful functions
[platform/core/uifw/libtdm.git] / src / tdm_display.c
index cd6e81e..d2fcde4 100644 (file)
@@ -9,7 +9,7 @@
  *          Taeheon Kim <th908.kim@samsung.com>,
  *          YoungJun Cho <yj44.cho@samsung.com>,
  *          SooChan Lim <sc1.lim@samsung.com>,
- *          Boram Park <sc1.lim@samsung.com>
+ *          Boram Park <boram1288.park@samsung.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
        tdm_private_display *private_display; \
        tdm_error ret = TDM_ERROR_NONE; /* default TDM_ERROR_NONE */\
        TDM_RETURN_VAL_IF_FAIL(dpy != NULL, TDM_ERROR_INVALID_PARAMETER); \
-       TDM_RETURN_VAL_IF_FAIL(tdm_display_is_valid(dpy), TDM_ERROR_INVALID_PARAMETER); \
        private_display = (tdm_private_display*)dpy;
 
 #define DISPLAY_FUNC_ENTRY_ERROR() \
        tdm_private_display *private_display; \
        tdm_error ret = TDM_ERROR_NONE; /* default TDM_ERROR_NONE */\
        TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(dpy != NULL, TDM_ERROR_INVALID_PARAMETER, NULL); \
-       TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(tdm_display_is_valid(dpy), TDM_ERROR_INVALID_PARAMETER, NULL); \
        private_display = (tdm_private_display*)dpy;
 
 #define BACKEND_FUNC_ENTRY() \
-       tdm_private_backend *private_backend; \
+       tdm_private_module *private_module; \
        tdm_private_display *private_display; \
        tdm_error ret = TDM_ERROR_NONE; /* default TDM_ERROR_NONE */\
-       TDM_RETURN_VAL_IF_FAIL(backend != NULL, TDM_ERROR_INVALID_PARAMETER); \
-       private_backend = (tdm_private_backend*)backend; \
-       private_display = private_backend->private_display;
+       TDM_RETURN_VAL_IF_FAIL(module != NULL, TDM_ERROR_INVALID_PARAMETER); \
+       private_module = (tdm_private_module*)module; \
+       private_display = private_module->private_display;
+
+INTERN tdm_error
+tdm_display_enable_debug_module(const char*modules)
+{
+       char temp[TDM_PATH_LEN];
+       char *arg;
+       char *end;
+
+       snprintf(temp, TDM_PATH_LEN, "%s", modules);
+
+       tdm_debug_module = 0;
+
+       arg = strtok_r(temp, TDM_CONFIG_DELIM, &end);
+       while (arg) {
+               if (!strncmp(arg, "none", 4)) {
+                       tdm_debug_module = 0;
+                       return TDM_ERROR_NONE;
+               }
+               if (!strncmp(arg, "all", 3)) {
+                       tdm_debug_module = 0xFFFFFFFF;
+                       return TDM_ERROR_NONE;
+               }
+               if (!strncmp(arg, "buffer", 6))
+                       tdm_debug_module |= TDM_DEBUG_BUFFER;
+               else if (!strncmp(arg, "event", 5))
+                       tdm_debug_module |= TDM_DEBUG_EVENT;
+               else if (!strncmp(arg, "thread", 6))
+                       tdm_debug_module |= TDM_DEBUG_THREAD;
+               else if (!strncmp(arg, "mutex", 5))
+                       tdm_debug_module |= TDM_DEBUG_MUTEX;
+               else if (!strncmp(arg, "vblank", 6))
+                       tdm_debug_module |= TDM_DEBUG_VBLANK;
+               else if (!strncmp(arg, "commit", 6))
+                       tdm_debug_module |= TDM_DEBUG_COMMIT;
+
+               arg = strtok_r(NULL, TDM_CONFIG_DELIM, &end);
+       }
+
+       TDM_INFO("module debugging... '%s'", modules);
+
+       return TDM_ERROR_NONE;
+}
+
+INTERN tdm_error
+tdm_display_enable_dump(tdm_private_display *private_display, const char *dump_str, char *reply, int *len)
+{
+       char temp[TDM_PATH_LEN] = {0,}, temp2[TDM_PATH_LEN] = {0,};
+       char *path = NULL, *path2;
+       char *arg;
+       char *end;
+
+       snprintf(temp2, TDM_PATH_LEN, "%s", dump_str);
+       path2 = strtostr(temp, TDM_PATH_LEN, temp2, "@");
+       if (!path2 || path2[0] == '\0')
+               path2 = TDM_DUMP_DIR;
+       else
+               path2++;
+
+       tdm_debug_dump = 0;
+
+       snprintf(temp, sizeof(temp), "%s", dump_str);
+       arg = strtok_r(temp, ",", &end);
+       TDM_GOTO_IF_FAIL(arg != NULL, done);
+
+       if (!strncmp(arg, "none", 4)) {
+               tdm_debug_dump = 0;
+               TDM_SNPRINTF(reply, len, "path: %s\n", (tdm_debug_dump_dir) ? : "unknown");
+               if (tdm_debug_dump_dir) {
+                       free(tdm_debug_dump_dir);
+                       tdm_debug_dump_dir = NULL;
+               }
+               goto done;
+       }
+
+       path = tdm_helper_dump_make_directory(path2, reply, len);
+       TDM_GOTO_IF_FAIL(path != NULL, done);
+
+       if (!strncmp(arg, "current", 7)) {
+               tdm_private_module *b = NULL;
+               tdm_private_output *o = NULL;
+
+               if (!private_display) {
+                       TDM_WRN("no private_display");
+                       goto done;
+               }
+
+               LIST_FOR_EACH_ENTRY(b, &private_display->module_list, link) {
+                       LIST_FOR_EACH_ENTRY(o, &b->output_list, link) {
+                               tdm_private_layer *l = NULL;
+                               LIST_FOR_EACH_ENTRY(l, &o->layer_list, link) {
+                                       char str[TDM_PATH_LEN];
+                                       if (l->usable || l->caps.capabilities & TDM_LAYER_CAPABILITY_VIDEO)
+                                               continue;
+                                       if (!l->showing_buffer)
+                                               continue;
+                                       snprintf(str, TDM_PATH_LEN, "layer_%d_%d", o->index, l->index);
+                                       tdm_helper_dump_buffer_str(l->showing_buffer->buffer, path, str);
+                               }
+                       }
+               }
+
+               TDM_SNPRINTF(reply, len, "path: %s\n", path);
+               goto done;
+       }
+
+       TDM_SNPRINTF(reply, len, "dump: %s\n", arg);
+
+       while (arg) {
+               if (!strncmp(arg, "all", 3)) {
+                       tdm_debug_dump = 0xFFFFFFFF;
+                       goto done;
+               } else if (!strncmp(arg, "layer", 5)) {
+                       tdm_debug_dump |= TDM_DUMP_FLAG_LAYER;
+               } else if (!strncmp(arg, "pp", 2)) {
+                       tdm_debug_dump |= TDM_DUMP_FLAG_PP;
+               } else if (!strncmp(arg, "capture", 7)) {
+                       tdm_debug_dump |= TDM_DUMP_FLAG_CAPTURE;
+               } else if (!strncmp(arg, "window", 6)) {
+                       tdm_debug_dump |= TDM_DUMP_FLAG_WINDOW;
+               } else
+                       goto done;
+
+               arg = strtok_r(NULL, ",", &end);
+       }
+
+       if (tdm_debug_dump_dir)
+               free(tdm_debug_dump_dir);
+
+       tdm_debug_dump_dir = strndup(path, TDM_PATH_LEN);
+
+       TDM_INFO("dump... '%s'", dump_str);
+
+done:
+       if (path)
+               free(path);
+
+       return TDM_ERROR_NONE;
+}
+
+static void
+_tdm_display_ttrace_vblank_cb(tdm_vblank *vblank, tdm_error error, unsigned int sequence,
+                                                         unsigned int tv_sec, unsigned int tv_usec, void *user_data)
+{
+       tdm_error ret = TDM_ERROR_NONE;
+
+       TDM_TRACE_MARK("VSYNC");
+
+       ret = tdm_vblank_wait(vblank, 0, 0, 1, _tdm_display_ttrace_vblank_cb, NULL);
+       TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
+}
+
+INTERN tdm_error
+tdm_display_enable_ttrace_vblank(tdm_display *dpy, tdm_output *output, int enable)
+{
+       tdm_private_display *private_display = dpy;
+       tdm_private_module *private_module = NULL;
+       tdm_private_output *private_output = NULL;
+       const tdm_output_mode *mode = NULL;
+       tdm_vblank *vblank = NULL;
+       tdm_error ret = TDM_ERROR_NONE;
+
+       if (!enable) {
+               LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) {
+                       LIST_FOR_EACH_ENTRY(private_output, &private_module->output_list, link) {
+                               if (private_output->ttrace_vblank)
+                                       tdm_vblank_destroy(private_output->ttrace_vblank);
+                               private_output->ttrace_vblank = NULL;
+                       }
+               }
+               return TDM_ERROR_NONE;
+       }
+
+       private_output = output;
+       TDM_RETURN_VAL_IF_FAIL(private_output != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+       if (private_output->ttrace_vblank)
+               return TDM_ERROR_NONE;
+
+       vblank = tdm_vblank_create(private_display, output, &ret);
+       TDM_RETURN_VAL_IF_FAIL(vblank != NULL, ret);
+
+       ret = tdm_output_get_mode(output, &mode);
+       TDM_GOTO_IF_FAIL(mode != NULL, enable_fail);
+
+       ret = tdm_vblank_set_fps(vblank, mode->vrefresh);
+       TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, enable_fail);
+
+       ret = tdm_vblank_set_enable_fake(vblank, 1);
+       TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, enable_fail);
+
+       ret = tdm_vblank_wait(vblank, 0, 0, 1, _tdm_display_ttrace_vblank_cb, NULL);
+       TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, enable_fail);
+
+       private_output->ttrace_vblank = vblank;
+
+       return TDM_ERROR_NONE;
+
+enable_fail:
+       if (vblank)
+               tdm_vblank_destroy(vblank);
+
+       return ret;
+}
+
+INTERN tdm_error
+tdm_display_enable_ttrace(tdm_private_display *private_display, const char *ttrace, int output_id, char *reply, int *len)
+{
+       char temp[TDM_PATH_LEN];
+       char *arg;
+       char *end;
+       tdm_output *output;
+       tdm_error ret;
+       tdm_output_type type;
+
+       snprintf(temp, TDM_PATH_LEN, "%s", ttrace);
+
+       tdm_ttrace_output = output_id;
+       tdm_ttrace_module = 0;
+
+       output = tdm_display_get_output(private_display, output_id, &ret);
+       if (!output) {
+               TDM_SNPRINTF(reply, len, "can't find the output_id(%d)\n", output_id);
+               return ret;
+       }
+
+       ret = tdm_output_get_output_type(output, &type);
+       if (ret != TDM_ERROR_NONE) {
+               TDM_SNPRINTF(reply, len, "can't find the type of output_id(%d)\n", output_id);
+               return ret;
+       }
+
+       arg = strtok_r(temp, TDM_CONFIG_DELIM, &end);
+       while (arg) {
+               if (!strncmp(arg, "none", 4))
+                       tdm_ttrace_module = 0;
+               else if (!strncmp(arg, "all", 3))
+                       tdm_ttrace_module = 0xFFFFFFFF;
+               else if (!strncmp(arg, "vsync", 5))
+                       tdm_ttrace_module |= TDM_TTRACE_VSYNC;
+               else if (!strncmp(arg, "client_vblank", 13))
+                       tdm_ttrace_module |= TDM_TTRACE_CLIENT_VBLANK;
+               else if (!strncmp(arg, "server_vblank", 13))
+                       tdm_ttrace_module |= TDM_TTRACE_SERVER_VBLANK;
+               else if (!strncmp(arg, "vblank", 6))
+                       tdm_ttrace_module |= TDM_TTRACE_VBLANK;
+               else if (!strncmp(arg, "layer", 5))
+                       tdm_ttrace_module |= TDM_TTRACE_LAYER;
+               else if (!strncmp(arg, "pp", 2))
+                       tdm_ttrace_module |= TDM_TTRACE_PP;
+               else if (!strncmp(arg, "capture", 7))
+                       tdm_ttrace_module |= TDM_TTRACE_CAPTURE;
+               else  {
+                       tdm_ttrace_module = 0;
+                       tdm_display_enable_ttrace_vblank(private_display, NULL, 0);
+                       tdm_server_enable_ttrace_client_vblank(private_display, NULL, 0);
+                       TDM_SNPRINTF(reply, len, "unknown option: '%s'\n", arg);
+                       return TDM_ERROR_NONE;
+               }
+
+               arg = strtok_r(NULL, TDM_CONFIG_DELIM, &end);
+       }
+
+       TDM_SNPRINTF(reply, len, "ttrace debugging... '%s' %x\n", ttrace, tdm_ttrace_module);
+
+       if (tdm_ttrace_module & TDM_TTRACE_VSYNC)
+               tdm_display_enable_ttrace_vblank(private_display, output, 1);
+       else
+               tdm_display_enable_ttrace_vblank(private_display, NULL, 0);
+
+       if (tdm_ttrace_module & TDM_TTRACE_CLIENT_VBLANK)
+               tdm_server_enable_ttrace_client_vblank(private_display, output, 1);
+       else
+               tdm_server_enable_ttrace_client_vblank(private_display, NULL, 0);
+
+       return TDM_ERROR_NONE;
+}
+
+INTERN tdm_error
+tdm_display_enable_fps(tdm_private_display *private_display, int enable)
+{
+       private_display->print_fps = enable;
+
+       TDM_INFO("print fps: %s", (enable) ? "enable" : "disable");
+
+       return TDM_ERROR_NONE;
+}
 
 EXTERN tdm_error
 tdm_display_get_capabilities(tdm_display *dpy,
                                                         tdm_display_capability *capabilities)
 {
-       tdm_private_backend *private_backend = NULL;
+       tdm_private_module *private_module = NULL;
 
        DISPLAY_FUNC_ENTRY();
 
@@ -77,8 +361,8 @@ tdm_display_get_capabilities(tdm_display *dpy,
 
        *capabilities = 0;
 
-       LIST_FOR_EACH_ENTRY(private_backend, &private_display->backend_list, link) {
-               *capabilities |= private_backend->capabilities;
+       LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) {
+               *capabilities |= private_module->capabilities;
        }
 
        _pthread_mutex_unlock(&private_display->lock);
@@ -90,7 +374,7 @@ EXTERN tdm_error
 tdm_display_get_pp_capabilities(tdm_display *dpy,
                                                                tdm_pp_capability *capabilities)
 {
-       tdm_private_backend *pp_backend;
+       tdm_private_module *pp_module;
 
        DISPLAY_FUNC_ENTRY();
 
@@ -98,7 +382,7 @@ tdm_display_get_pp_capabilities(tdm_display *dpy,
 
        _pthread_mutex_lock(&private_display->lock);
 
-       if (!private_display->pp_backend) {
+       if (!private_display->pp_module) {
                /* LCOV_EXCL_START */
                TDM_ERR("no pp capability");
                _pthread_mutex_unlock(&private_display->lock);
@@ -106,9 +390,9 @@ tdm_display_get_pp_capabilities(tdm_display *dpy,
                /* LCOV_EXCL_STOP */
        }
 
-       pp_backend = private_display->pp_backend;
+       pp_module = private_display->pp_module;
 
-       *capabilities = pp_backend->caps_pp.capabilities;
+       *capabilities = pp_module->caps_pp.capabilities;
 
        _pthread_mutex_unlock(&private_display->lock);
 
@@ -119,7 +403,7 @@ EXTERN tdm_error
 tdm_display_get_pp_available_formats(tdm_display *dpy,
                                                                         const tbm_format **formats, int *count)
 {
-       tdm_private_backend *pp_backend;
+       tdm_private_module *pp_module;
 
        DISPLAY_FUNC_ENTRY();
 
@@ -128,7 +412,7 @@ tdm_display_get_pp_available_formats(tdm_display *dpy,
 
        _pthread_mutex_lock(&private_display->lock);
 
-       if (!private_display->pp_backend) {
+       if (!private_display->pp_module) {
                /* LCOV_EXCL_START */
                TDM_ERR("no pp capability");
                _pthread_mutex_unlock(&private_display->lock);
@@ -136,10 +420,10 @@ tdm_display_get_pp_available_formats(tdm_display *dpy,
                /* LCOV_EXCL_STOP */
        }
 
-       pp_backend = private_display->pp_backend;
+       pp_module = private_display->pp_module;
 
-       *formats = (const tbm_format *)pp_backend->caps_pp.formats;
-       *count = pp_backend->caps_pp.format_count;
+       *formats = (const tbm_format *)pp_module->caps_pp.formats;
+       *count = pp_module->caps_pp.format_count;
 
        _pthread_mutex_unlock(&private_display->lock);
 
@@ -150,13 +434,13 @@ EXTERN tdm_error
 tdm_display_get_pp_available_size(tdm_display *dpy, int *min_w, int *min_h,
                                                                  int *max_w, int *max_h, int *preferred_align)
 {
-       tdm_private_backend *pp_backend;
+       tdm_private_module *pp_module;
 
        DISPLAY_FUNC_ENTRY();
 
        _pthread_mutex_lock(&private_display->lock);
 
-       if (!private_display->pp_backend) {
+       if (!private_display->pp_module) {
                /* LCOV_EXCL_START */
                TDM_ERR("no pp capability");
                _pthread_mutex_unlock(&private_display->lock);
@@ -164,18 +448,18 @@ tdm_display_get_pp_available_size(tdm_display *dpy, int *min_w, int *min_h,
                /* LCOV_EXCL_STOP */
        }
 
-       pp_backend = private_display->pp_backend;
+       pp_module = private_display->pp_module;
 
        if (min_w)
-               *min_w = TDM_FRONT_VALUE(pp_backend->caps_pp.min_w);
+               *min_w = TDM_FRONT_VALUE(pp_module->caps_pp.min_w);
        if (min_h)
-               *min_h = TDM_FRONT_VALUE(pp_backend->caps_pp.min_h);
+               *min_h = TDM_FRONT_VALUE(pp_module->caps_pp.min_h);
        if (max_w)
-               *max_w = TDM_FRONT_VALUE(pp_backend->caps_pp.max_w);
+               *max_w = TDM_FRONT_VALUE(pp_module->caps_pp.max_w);
        if (max_h)
-               *max_h = TDM_FRONT_VALUE(pp_backend->caps_pp.max_h);
+               *max_h = TDM_FRONT_VALUE(pp_module->caps_pp.max_h);
        if (preferred_align)
-               *preferred_align = TDM_FRONT_VALUE(pp_backend->caps_pp.preferred_align);
+               *preferred_align = TDM_FRONT_VALUE(pp_module->caps_pp.preferred_align);
 
        _pthread_mutex_unlock(&private_display->lock);
 
@@ -186,7 +470,7 @@ EXTERN tdm_error
 tdm_display_get_capture_capabilities(tdm_display *dpy,
                                                                         tdm_capture_capability *capabilities)
 {
-       tdm_private_backend *capture_backend;
+       tdm_private_module *capture_module;
 
        DISPLAY_FUNC_ENTRY();
 
@@ -194,7 +478,7 @@ tdm_display_get_capture_capabilities(tdm_display *dpy,
 
        _pthread_mutex_lock(&private_display->lock);
 
-       if (!private_display->capture_backend) {
+       if (!private_display->capture_module) {
                /* LCOV_EXCL_START */
                TDM_ERR("no capture capability");
                _pthread_mutex_unlock(&private_display->lock);
@@ -202,9 +486,9 @@ tdm_display_get_capture_capabilities(tdm_display *dpy,
                /* LCOV_EXCL_STOP */
        }
 
-       capture_backend = private_display->capture_backend;
+       capture_module = private_display->capture_module;
 
-       *capabilities = capture_backend->caps_capture.capabilities;
+       *capabilities = capture_module->caps_capture.capabilities;
 
        _pthread_mutex_unlock(&private_display->lock);
 
@@ -215,7 +499,7 @@ EXTERN tdm_error
 tdm_display_get_capture_available_formats(tdm_display *dpy,
                const tbm_format **formats, int *count)
 {
-       tdm_private_backend *capture_backend;
+       tdm_private_module *capture_module;
 
        DISPLAY_FUNC_ENTRY();
 
@@ -224,7 +508,7 @@ tdm_display_get_capture_available_formats(tdm_display *dpy,
 
        _pthread_mutex_lock(&private_display->lock);
 
-       if (!private_display->capture_backend) {
+       if (!private_display->capture_module) {
                /* LCOV_EXCL_START */
                TDM_ERR("no capture capability");
                _pthread_mutex_unlock(&private_display->lock);
@@ -232,10 +516,10 @@ tdm_display_get_capture_available_formats(tdm_display *dpy,
                /* LCOV_EXCL_STOP */
        }
 
-       capture_backend = private_display->capture_backend;
+       capture_module = private_display->capture_module;
 
-       *formats = (const tbm_format *)capture_backend->caps_capture.formats;
-       *count = capture_backend->caps_capture.format_count;
+       *formats = (const tbm_format *)capture_module->caps_capture.formats;
+       *count = capture_module->caps_capture.format_count;
 
        _pthread_mutex_unlock(&private_display->lock);
 
@@ -246,13 +530,13 @@ EXTERN tdm_error
 tdm_display_get_capture_available_size(tdm_display *dpy, int *min_w, int *min_h,
                                                                           int *max_w, int *max_h, int *preferred_align)
 {
-       tdm_private_backend *capture_backend;
+       tdm_private_module *capture_module;
 
        DISPLAY_FUNC_ENTRY();
 
        _pthread_mutex_lock(&private_display->lock);
 
-       if (!private_display->capture_backend) {
+       if (!private_display->capture_module) {
                /* LCOV_EXCL_START */
                TDM_ERR("no capture capability");
                _pthread_mutex_unlock(&private_display->lock);
@@ -260,18 +544,18 @@ tdm_display_get_capture_available_size(tdm_display *dpy, int *min_w, int *min_h,
                /* LCOV_EXCL_STOP */
        }
 
-       capture_backend = private_display->capture_backend;
+       capture_module = private_display->capture_module;
 
        if (min_w)
-               *min_w = TDM_FRONT_VALUE(capture_backend->caps_capture.min_w);
+               *min_w = TDM_FRONT_VALUE(capture_module->caps_capture.min_w);
        if (min_h)
-               *min_h = TDM_FRONT_VALUE(capture_backend->caps_capture.min_h);
+               *min_h = TDM_FRONT_VALUE(capture_module->caps_capture.min_h);
        if (max_w)
-               *max_w = TDM_FRONT_VALUE(capture_backend->caps_capture.max_w);
+               *max_w = TDM_FRONT_VALUE(capture_module->caps_capture.max_w);
        if (max_h)
-               *max_h = TDM_FRONT_VALUE(capture_backend->caps_capture.max_h);
+               *max_h = TDM_FRONT_VALUE(capture_module->caps_capture.max_h);
        if (preferred_align)
-               *preferred_align = TDM_FRONT_VALUE(capture_backend->caps_capture.preferred_align);
+               *preferred_align = TDM_FRONT_VALUE(capture_module->caps_capture.preferred_align);
 
        _pthread_mutex_unlock(&private_display->lock);
 
@@ -294,7 +578,7 @@ tdm_display_get_max_layer_count(tdm_display *dpy, int *max_count)
 EXTERN tdm_error
 tdm_display_get_output_count(tdm_display *dpy, int *count)
 {
-       tdm_private_backend *private_backend = NULL;
+       tdm_private_module *private_module = NULL;
        tdm_private_output *private_output = NULL;
 
        DISPLAY_FUNC_ENTRY();
@@ -304,8 +588,8 @@ tdm_display_get_output_count(tdm_display *dpy, int *count)
        _pthread_mutex_lock(&private_display->lock);
 
        *count = 0;
-       LIST_FOR_EACH_ENTRY(private_backend, &private_display->backend_list, link) {
-               LIST_FOR_EACH_ENTRY(private_output, &private_backend->output_list, link) {
+       LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) {
+               LIST_FOR_EACH_ENTRY(private_output, &private_module->output_list, link) {
                        (*count)++;
                }
        }
@@ -319,7 +603,7 @@ tdm_display_get_output_count(tdm_display *dpy, int *count)
 EXTERN tdm_output *
 tdm_display_get_output(tdm_display *dpy, int index, tdm_error *error)
 {
-       tdm_private_backend *private_backend = NULL;
+       tdm_private_module *private_module = NULL;
        tdm_private_output *private_output = NULL;
 
        DISPLAY_FUNC_ENTRY_ERROR();
@@ -329,8 +613,8 @@ tdm_display_get_output(tdm_display *dpy, int index, tdm_error *error)
        if (error)
                *error = TDM_ERROR_NONE;
 
-       LIST_FOR_EACH_ENTRY(private_backend, &private_display->backend_list, link) {
-               LIST_FOR_EACH_ENTRY(private_output, &private_backend->output_list, link) {
+       LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) {
+               LIST_FOR_EACH_ENTRY(private_output, &private_module->output_list, link) {
                        if (private_output->index == index) {
                                _pthread_mutex_unlock(&private_display->lock);
                                return private_output;
@@ -346,7 +630,7 @@ tdm_display_get_output(tdm_display *dpy, int index, tdm_error *error)
 EXTERN tdm_output *
 tdm_display_find_output(tdm_display *dpy, const char *name, tdm_error *error)
 {
-       tdm_private_backend *private_backend = NULL;
+       tdm_private_module *private_module = NULL;
        tdm_private_output *private_output = NULL;
 
        DISPLAY_FUNC_ENTRY_ERROR();
@@ -360,8 +644,8 @@ tdm_display_find_output(tdm_display *dpy, const char *name, tdm_error *error)
        if (error)
                *error = TDM_ERROR_NONE;
 
-       LIST_FOR_EACH_ENTRY(private_backend, &private_display->backend_list, link) {
-               LIST_FOR_EACH_ENTRY(private_output, &private_backend->output_list, link) {
+       LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) {
+               LIST_FOR_EACH_ENTRY(private_output, &private_module->output_list, link) {
                        if (strncmp(private_output->caps.model, name, TDM_NAME_LEN))
                                continue;
                        _pthread_mutex_unlock(&private_display->lock);
@@ -454,18 +738,18 @@ EXTERN tdm_error
 tdm_display_get_backend_info(tdm_display *dpy, const char **name,
                                                         const char **vendor, int *major, int *minor)
 {
-       tdm_private_backend *private_backend;
+       tdm_private_module *private_module = NULL;
        tdm_backend_module *module_data = NULL;
 
        DISPLAY_FUNC_ENTRY();
 
-       TDM_DEPRECATED("Use tdm_backend_get_info");
+       TDM_DEPRECATED("Use tdm_module_get_info");
 
        _pthread_mutex_lock(&private_display->lock);
 
        /* use first backend */
-       LIST_FOR_EACH_ENTRY(private_backend, &private_display->backend_list, link) {
-               module_data = private_backend->module_data;
+       LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) {
+               module_data = private_module->module_data;
                break;
        }
 
@@ -485,9 +769,25 @@ tdm_display_get_backend_info(tdm_display *dpy, const char **name,
        return ret;
 }
 
+EXTERN tdm_pp *
+tdm_display_create_pp(tdm_display *dpy, tdm_error *error)
+{
+       tdm_pp *pp;
+
+       DISPLAY_FUNC_ENTRY_ERROR();
+
+       _pthread_mutex_lock(&private_display->lock);
+
+       pp = (tdm_pp *)tdm_pp_create_internal(private_display->pp_module, error);
+
+       _pthread_mutex_unlock(&private_display->lock);
+
+       return pp;
+}
+
 EXTERN tdm_error
-tdm_backend_get_info(tdm_backend *backend, const char **name,
-                                        const char **vendor, int *major, int *minor)
+tdm_module_get_info(tdm_module *module, const char **name,
+                                       const char **vendor, int *major, int *minor)
 {
        tdm_backend_module *module_data;
 
@@ -495,7 +795,7 @@ tdm_backend_get_info(tdm_backend *backend, const char **name,
 
        _pthread_mutex_lock(&private_display->lock);
 
-       module_data = private_backend->module_data;
+       module_data = private_module->module_data;
 
        if (name)
                *name = module_data->name;
@@ -511,18 +811,17 @@ tdm_backend_get_info(tdm_backend *backend, const char **name,
        return ret;
 }
 
-EXTERN tdm_pp *
-tdm_display_create_pp(tdm_display *dpy, tdm_error *error)
+INTERN int
+tdm_module_check_abi(tdm_private_module *private_module, int abimaj, int abimin)
 {
-       tdm_pp *pp;
+       tdm_backend_module *module = private_module->module_data;
 
-       DISPLAY_FUNC_ENTRY_ERROR();
+       if (TDM_BACKEND_GET_ABI_MAJOR(module->abi_version) < abimaj)
+               return 0;
 
-       _pthread_mutex_lock(&private_display->lock);
-
-       pp = (tdm_pp *)tdm_pp_create_internal(private_display->pp_backend, error);
-
-       _pthread_mutex_unlock(&private_display->lock);
+       if (TDM_BACKEND_GET_ABI_MINOR(module->abi_version) < abimin)
+               return 0;
 
-       return pp;
+       return 1;
 }
+