From 41890545a67a98a6bd2e63ee065a481e7ad08baf Mon Sep 17 00:00:00 2001 From: Konstantin Drabeniuk Date: Wed, 8 Nov 2017 09:41:04 +0200 Subject: [PATCH] tdm_display_deinit: use tbm_drm_helper_unset_tbm_master_fd() for unset tbm_master_fd It is wrong to use tdm_helper_set_fd() func. to unset TDM_DRM_MASTER_FD. tdm_helper_set_fd() call tbm_drm_helper_set_tbm_master_fd() which fails when we pass -1. The error was found as result of utests. Change-Id: I5d67b5841a5fafde6424890d32ae480be7c1808a Signed-off-by: Konstantin Drabeniuk --- src/tdm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tdm.c b/src/tdm.c index d0f0e44..7c12dfe 100644 --- a/src/tdm.c +++ b/src/tdm.c @@ -41,6 +41,7 @@ #include "tdm_backend.h" #include "tdm_private.h" #include "tdm_helper.h" +#include pthread_mutex_t tdm_mutex_check_lock = PTHREAD_MUTEX_INITIALIZER; int tdm_mutex_locked; @@ -1079,7 +1080,7 @@ tdm_display_deinit(tdm_display *dpy) tbm_bufmgr_deinit(private_display->bufmgr); #endif - tdm_helper_set_fd("TDM_DRM_MASTER_FD", -1); + tbm_drm_helper_unset_tbm_master_fd(); pthread_mutex_destroy(&private_display->lock); free(private_display); -- 2.7.4