tbm_bufmgr: lock/unlock tbm_bufmgr_mutex at tbm_bufmgr function

[platform/core/uifw/libtbm.git] / src / tbm_drm_helper_client.c

diff --git a/src/tbm_drm_helper_client.c b/src/tbm_drm_helper_client.c
index 7bc0eea..29d9409 100644 (file)
--- a/src/tbm_drm_helper_client.c
+++ b/src/tbm_drm_helper_client.c
@@ -31,6 +31,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define WL_HIDE_DEPRECATED
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -50,6 +52,9 @@ struct wayland_tbm_drm_auth_client {
        uint32_t capabilities;
 };
 
+static int tbm_drm_fd = -1;
+
+/* LCOV_EXCL_START */
 static void
 handle_tbm_drm_authentication_info(void *data, struct wl_tbm_drm_auth *wl_tbm_drm_auth, const char *device_name, uint32_t capabilities, int32_t auth_fd)
 {
@@ -63,7 +68,7 @@ handle_tbm_drm_authentication_info(void *data, struct wl_tbm_drm_auth *wl_tbm_dr
 }
 
 static const struct wl_tbm_drm_auth_listener wl_tbm_drm_auth_client_listener = {
-    handle_tbm_drm_authentication_info
+       handle_tbm_drm_authentication_info
 };
 
 static void
@@ -79,9 +84,14 @@ _wayland_tbm_drm_auth_client_registry_handle_global(void *data, struct wl_regist
        }
 }
 
+static void
+_wayland_tbm_drm_auth_client_registry_remove_global(void *data, struct wl_registry *registry, uint32_t name)
+{
+}
+
 static const struct wl_registry_listener registry_listener = {
-    _wayland_tbm_drm_auth_client_registry_handle_global,
-    NULL
+       _wayland_tbm_drm_auth_client_registry_handle_global,
+       _wayland_tbm_drm_auth_client_registry_remove_global
 };
 
 int
@@ -98,7 +108,7 @@ tbm_drm_helper_get_auth_info(int *auth_fd, char **device, uint32_t *capabilities
 
        display = wl_display_connect("tbm-drm-auth");
        if (!display) {
-               TBM_LOG("Failed to connect display\n");
+               TBM_ERR("Failed to connect display\n");
                free(tbm_drm_client);
 
                return 0;
@@ -108,7 +118,7 @@ tbm_drm_helper_get_auth_info(int *auth_fd, char **device, uint32_t *capabilities
 
        wl_registry = wl_display_get_registry(display);
        if (!wl_registry) {
-               TBM_LOG("Failed to get registry\n");
+               TBM_ERR("Failed to get registry\n");
                wl_display_disconnect(display);
                free(tbm_drm_client);
 
@@ -116,10 +126,16 @@ tbm_drm_helper_get_auth_info(int *auth_fd, char **device, uint32_t *capabilities
        }
 
        wl_registry_add_listener(wl_registry, &registry_listener, tbm_drm_client);
-       wl_display_roundtrip(display); //For Gloabl registry
+       if (wl_display_roundtrip(display) < 0) { //For Gloabl registry
+               TBM_ERR("Failed to wl_display_roundtrip for global registry\n");
+               wl_registry_destroy(wl_registry);
+               wl_display_disconnect(display);
+               free(tbm_drm_client);
+               return 0;
+       }
 
        if (!tbm_drm_client->wl_tbm_drm_auth) {
-               TBM_LOG("Failed to get wl_tbm_drm_auth interface\n");
+               TBM_ERR("Failed to get wl_tbm_drm_auth interface\n");
                wl_registry_destroy(wl_registry);
                wl_display_disconnect(display);
                free(tbm_drm_client);
@@ -128,10 +144,18 @@ tbm_drm_helper_get_auth_info(int *auth_fd, char **device, uint32_t *capabilities
        }
 
        wl_tbm_drm_auth_get_authentication_info(tbm_drm_client->wl_tbm_drm_auth);
-       wl_display_roundtrip(display);
+       if (wl_display_roundtrip(display) < 0) {
+               TBM_ERR("Failed to wl_display_roundtrip get auth info\n");
+               wl_tbm_drm_auth_set_user_data(tbm_drm_client->wl_tbm_drm_auth, NULL);
+               wl_tbm_drm_auth_destroy(tbm_drm_client->wl_tbm_drm_auth);
+               wl_registry_destroy(wl_registry);
+               wl_display_disconnect(display);
+               free(tbm_drm_client);
+               return 0;
+       }
 
        if (tbm_drm_client->auth_fd < 0) {
-               TBM_LOG("Failed to get auth info\n");
+               TBM_ERR("Failed to get auth info\n");
                wl_tbm_drm_auth_set_user_data(tbm_drm_client->wl_tbm_drm_auth, NULL);
                wl_tbm_drm_auth_destroy(tbm_drm_client->wl_tbm_drm_auth);
                wl_registry_destroy(wl_registry);
@@ -169,3 +193,69 @@ tbm_drm_helper_get_auth_info(int *auth_fd, char **device, uint32_t *capabilities
 
        return 1;
 }
+
+
+void
+tbm_drm_helper_set_fd(int fd)
+{
+       int fd_max = tbm_bufmgr_get_fd_limit();
+
+       if (tbm_drm_fd == fd)
+               return;
+
+       if (fd < 0 || fd > fd_max) {
+               TBM_ERR("%d out of fd range\n", fd);
+               return;
+       }
+
+       if (tbm_drm_fd != -1)
+               TBM_WRN("already has TBM_DRM_FD: %d\n", tbm_drm_fd);
+
+       tbm_drm_fd = fd;
+
+       TBM_INFO("TBM_DRM_FD: %d\n", tbm_drm_fd);
+}
+
+void
+tbm_drm_helper_unset_fd(void)
+{
+       tbm_drm_fd = -1;
+       TBM_INFO("TBM_DRM_FD: %d\n", tbm_drm_fd);
+}
+
+int
+tbm_drm_helper_get_fd(void)
+{
+       int new_fd, flags;
+
+       if (tbm_drm_fd == -1) {
+               TBM_ERR("no drm fd");
+               return -1;
+       }
+
+       TBM_INFO("TBM_DRM_FD: %d\n", tbm_drm_fd);
+
+       flags = fcntl(tbm_drm_fd, F_GETFD);
+       if (flags == -1) {
+               TBM_ERR("fcntl failed: %m");
+               return -1;
+       }
+
+       new_fd = dup(tbm_drm_fd);
+       if (new_fd < 0) {
+               TBM_ERR("dup failed: %m");
+               return -1;
+       }
+
+       if (fcntl(new_fd, F_SETFD, flags|FD_CLOEXEC) == -1) {
+               TBM_ERR("failed to set fd\n");
+               close(new_fd);
+               return -1;
+       }
+
+       TBM_INFO("Return TBM_FD: %d\n", new_fd);
+
+       return new_fd;
+}
+
+/* LCOV_EXCL_STOP */