From 0118adc64860dcec77d99a83548e82a1a7ec27a8 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Wed, 12 Jun 2013 21:12:01 +0900 Subject: [PATCH] add tgl device to use tgl. Change-Id: I8eb38f3e5d00e4e8ce4ceaee678ce8072fbb7143 --- src/tbm_bufmgr.c | 17 +++++++++++------ src/{tbm_bufmgr_glock.h => tbm_bufmgr_tgl.h} | 7 ++++--- 2 files changed, 15 insertions(+), 9 deletions(-) rename src/{tbm_bufmgr_glock.h => tbm_bufmgr_tgl.h} (91%) diff --git a/src/tbm_bufmgr.c b/src/tbm_bufmgr.c index 92bed11..b1c764c 100755 --- a/src/tbm_bufmgr.c +++ b/src/tbm_bufmgr.c @@ -44,7 +44,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include "tbm_bufmgr.h" -#include "tbm_bufmgr_glock.h" +#include "tbm_bufmgr_tgl.h" #include "tbm_bufmgr_backend.h" #include "tbm_bufmgr_int.h" #include "list.h" @@ -658,14 +658,19 @@ _tbm_bufmgr_init_state (tbm_bufmgr bufmgr) { RETURN_VAL_CHECK_FLAG (TBM_ALL_CTRL_BACKEND_VALID(bufmgr->backend->flags), 1); - bufmgr->lock_fd = open(tgl_devfile, O_RDWR); + bufmgr->lock_fd = open (tgl_devfile, O_RDWR); if(bufmgr->lock_fd < 0) { - TBM_LOG ("[libtbm:%d] " - "error: Fail to open global_lock:%s\n", - getpid(), tgl_devfile); - return 0; + bufmgr->lock_fd = open (tgl_devfile1, O_RDWR); + if(bufmgr->lock_fd < 0) + { + + TBM_LOG ("[libtbm:%d] " + "error: Fail to open global_lock:%s\n", + getpid(), tgl_devfile); + return 0; + } } if (!_tgl_init(bufmgr->lock_fd, GLOBAL_KEY)) diff --git a/src/tbm_bufmgr_glock.h b/src/tbm_bufmgr_tgl.h similarity index 91% rename from src/tbm_bufmgr_glock.h rename to src/tbm_bufmgr_tgl.h index cde87ef..10ec1a8 100644 --- a/src/tbm_bufmgr_glock.h +++ b/src/tbm_bufmgr_tgl.h @@ -8,12 +8,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __TBM_BUFMGR_GLOCK_H__ -#define __TBM_BUFMGR_GLOCK_H__ +#ifndef __TBM_BUFMGR_TGL_H__ +#define __TBM_BUFMGR_TGL_H__ #include static char tgl_devfile[] = "/dev/slp_global_lock"; +static char tgl_devfile1[] = "/dev/tgl"; #define TGL_IOC_BASE 0x32 @@ -45,4 +46,4 @@ typedef enum { #define TGL_IOC_SET_DATA _IOW(TGL_IOC_BASE, _TGL_SET_DATA, struct tgl_user_data *) #define TGL_IOC_GET_DATA _IOW(TGL_IOC_BASE, _TGL_GET_DATA, struct tgl_user_data *) -#endif /* __TBM_BUFMGR_GLOCK_H__ */ +#endif /* __TBM_BUFMGR_TGL_H__ */ -- 2.7.4