diff options
| author | Hemant Hariyani <hemanthariyani@ti.com> | 2013-07-03 15:14:18 -0700 |
|---|---|---|
| committer | Andrew Jiang <sam.andrew.jiang@gmail.com> | 2013-07-04 07:33:40 -0400 |
| commit | 363c0c259416c7e9d93ddf6ffcb655153bff9158 (patch) | |
| tree | bf7fda0dfb7a4cbc33656c8b2b37000c13ad1cd0 /pvr-source/services4/srvkm/env/linux/osfunc.c | |
| parent | 08130d7fa7748feefb437ffb8f626dab7d75679e (diff) | |
| download | device_samsung_omap4-common-363c0c259416c7e9d93ddf6ffcb655153bff9158.zip device_samsung_omap4-common-363c0c259416c7e9d93ddf6ffcb655153bff9158.tar.gz device_samsung_omap4-common-363c0c259416c7e9d93ddf6ffcb655153bff9158.tar.bz2 | |
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; } |