diff options
| author | Hemant Hariyani <hemanthariyani@ti.com> | 2013-07-03 15:14:18 -0700 |
|---|---|---|
| committer | Hashcode <hashcode0f@gmail.com> | 2015-02-06 11:00:32 -0800 |
| commit | 236af44d2574763532288a063f7745ebd2432b5f (patch) | |
| tree | 3e92c8856dc82938600d174ad08446cc0e1b71ce /pvr-source/services4/srvkm/env/linux/osfunc.c | |
| parent | 391c312c8964088c512de2cfb1e29c78d245d06b (diff) | |
| download | hardware_ti_omap4-236af44d2574763532288a063f7745ebd2432b5f.tar.gz hardware_ti_omap4-236af44d2574763532288a063f7745ebd2432b5f.tar.bz2 hardware_ti_omap4-236af44d2574763532288a063f7745ebd2432b5f.zip | |
SGX-BIN: DDK binaries and KM source 1.9@2291151
Includes new pixel formats.
Change-Id: I4a56e6bff9c477610f2ce30706831f66dcc9c651
Diffstat (limited to 'pvr-source/services4/srvkm/env/linux/osfunc.c')
| -rw-r--r-- | pvr-source/services4/srvkm/env/linux/osfunc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pvr-source/services4/srvkm/env/linux/osfunc.c b/pvr-source/services4/srvkm/env/linux/osfunc.c index ac03185..4c39621 100644 --- a/pvr-source/services4/srvkm/env/linux/osfunc.c +++ b/pvr-source/services4/srvkm/env/linux/osfunc.c @@ -4079,7 +4079,7 @@ IMG_BOOL CheckExecuteCacheOp(IMG_HANDLE hOSMemHandle, PVR_ASSERT(psLinuxMemArea != IMG_NULL); - LinuxLockMutex(&g_sMMapMutex); + LinuxLockMutexNested(&g_sMMapMutex, PVRSRV_LOCK_CLASS_MMAP); psMMapOffsetStructList = &psLinuxMemArea->sMMapOffsetStructList; ui32AreaLength = psLinuxMemArea->ui32ByteSize; @@ -4609,7 +4609,7 @@ IMG_VOID OSReleaseBridgeLock(IMG_VOID) IMG_VOID OSReacquireBridgeLock(IMG_VOID) { - LinuxLockMutex(&gPVRSRVLock); + LinuxLockMutexNested(&gPVRSRVLock, PVRSRV_LOCK_CLASS_BRIDGE); } typedef struct _OSTime @@ -4627,7 +4627,7 @@ PVRSRV_ERROR OSTimeCreateWithUSOffset(IMG_PVOID *pvRet, IMG_UINT32 ui32USOffset) return PVRSRV_ERROR_OUT_OF_MEMORY; } - psOSTime->ulTime = usecs_to_jiffies(jiffies_to_usecs(jiffies) + ui32USOffset); + psOSTime->ulTime = jiffies + usecs_to_jiffies(ui32USOffset); *pvRet = psOSTime; return PVRSRV_OK; } |