fixes for bc_cat

[sgx.git] / pvr / pvr_bridge_km.h

diff --git a/pvr/pvr_bridge_km.h b/pvr/pvr_bridge_km.h
index 3acc66e..120c8f8 100644 (file)
--- a/pvr/pvr_bridge_km.h
+++ b/pvr/pvr_bridge_km.h
@@ -27,12 +27,43 @@
 #ifndef __PVR_BRIDGE_KM_H_
 #define __PVR_BRIDGE_KM_H_
 
-#include <linux/file.h>
+#include <linux/fs.h>                  /* for struct file */
+#include <linux/wait.h>
+#include <linux/sched.h>
 
-#include "kernelbuffer.h"
 #include "pvr_bridge.h"
 #include "perproc.h"
 
+extern void pvr_dev_lock(void);
+extern void pvr_dev_unlock(void);
+extern struct mutex gPVRSRVLock;
+extern int pvr_disabled;
+
+static inline void pvr_lock(void)
+{
+       mutex_lock(&gPVRSRVLock);
+}
+
+static inline void pvr_unlock(void)
+{
+       mutex_unlock(&gPVRSRVLock);
+}
+
+static inline int pvr_is_locked(void)
+{
+       return mutex_is_locked(&gPVRSRVLock);
+}
+
+static inline void pvr_disable(void)
+{
+       pvr_disabled = 1;
+}
+
+static inline int pvr_is_disabled(void)
+{
+       return unlikely(pvr_disabled);
+}
+
 enum PVRSRV_ERROR LinuxBridgeInit(void);
 void LinuxBridgeDeInit(void);
 
@@ -59,7 +90,7 @@ enum PVRSRV_ERROR PVRSRVCreateDeviceMemContextKM(void *hDevCookie,
                IMG_BOOL *pbShared);
 
 enum PVRSRV_ERROR PVRSRVDestroyDeviceMemContextKM(void *hDevCookie,
-               void *hDevMemContext, IMG_BOOL *pbCreated);
+               void *hDevMemContext);
 
 enum PVRSRV_ERROR PVRSRVGetDeviceMemHeapInfoKM(void *hDevCookie,
                void *hDevMemContext, u32 *pui32ClientHeapCount,
@@ -93,17 +124,13 @@ enum PVRSRV_ERROR PVRSRVUnmapDeviceMemoryKM(
                struct PVRSRV_KERNEL_MEM_INFO *psMemInfo);
 
 enum PVRSRV_ERROR PVRSRVWrapExtMemoryKM(void *hDevCookie,
-               struct PVRSRV_PER_PROCESS_DATA *psPerProc, u32 ui32ByteSize,
-               u32 ui32PageOffset, IMG_BOOL bPhysContig,
+               struct PVRSRV_PER_PROCESS_DATA *psPerProc, void *hDevMemContext,
+               u32 ui32ByteSize, u32 ui32PageOffset, IMG_BOOL bPhysContig,
                struct IMG_SYS_PHYADDR *psSysAddr, void *pvLinAddr,
                struct PVRSRV_KERNEL_MEM_INFO **ppsMemInfo);
 
-enum PVRSRV_ERROR PVRSRVIsWrappedExtMemoryKM(void *hDevCookie,
-               struct PVRSRV_PER_PROCESS_DATA *psPerProc, u32 *pui32ByteSize,
-               void **pvLinAddr);
-
-enum PVRSRV_ERROR PVRSRVUnwrapExtMemoryKM(
-               struct PVRSRV_KERNEL_MEM_INFO *psMemInfo);
+enum PVRSRV_ERROR PVRSRVUnwrapExtMemoryKM(struct PVRSRV_KERNEL_MEM_INFO
+                                             *psMemInfo);
 
 enum PVRSRV_ERROR PVRSRVEnumerateDCKM(enum PVRSRV_DEVICE_CLASS DeviceClass,
                u32 *pui32DevCount, u32 *pui32DevID);
@@ -158,13 +185,11 @@ enum PVRSRV_ERROR PVRSRVCloseBCDeviceKM(void *hDeviceKM,
 
 enum PVRSRV_ERROR PVRSRVGetBCInfoKM(void *hDeviceKM,
                struct BUFFER_INFO *psBufferInfo);
-enum PVRSRV_ERROR PVRSRVGetBCBufferKM(void *hDeviceKM, u32 ui32BufferIndex,
-               void **phBuffer);
-extern IMG_BOOL PVRGetBufferClassJTable(
-               struct PVRSRV_BC_BUFFER2SRV_KMJTABLE *psJTable);
+enum PVRSRV_ERROR PVRSRVGetBCBufferKM(void *hDeviceKM,
+               u32 ui32BufferIndex, void **phBuffer);
 
 enum PVRSRV_ERROR PVRSRVMapDeviceClassMemoryKM(
-               struct PVRSRV_PER_PROCESS_DATA *psPerProc,
+               struct PVRSRV_PER_PROCESS_DATA *psPerProc, void *hDevMemContext,
                void *hDeviceClassBuffer,
                struct PVRSRV_KERNEL_MEM_INFO **ppsMemInfo, void **phOSMapInfo);
 
@@ -180,8 +205,6 @@ enum PVRSRV_ERROR PVRSRVFreeSyncInfoKM(
 
 enum PVRSRV_ERROR PVRSRVGetMiscInfoKM(struct PVRSRV_MISC_INFO *psMiscInfo);
 
-enum PVRSRV_ERROR PVRSRVGetFBStatsKM(u32 *pui32Total, u32 *pui32Available);
-
 enum PVRSRV_ERROR PVRSRVAllocSharedSysMemoryKM(
                struct PVRSRV_PER_PROCESS_DATA *psPerProc, u32 ui32Flags,
                u32 ui32Size, struct PVRSRV_KERNEL_MEM_INFO **ppsKernelMemInfo);
@@ -192,7 +215,6 @@ enum PVRSRV_ERROR PVRSRVFreeSharedSysMemoryKM(
 enum PVRSRV_ERROR PVRSRVDissociateMemFromResmanKM(
                struct PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo);
 
-long PVRSRV_BridgeDispatchKM(struct file *file, unsigned int cmd,
-                            unsigned long arg);
+long PVRSRV_BridgeDispatchKM(struct file *, unsigned, unsigned long);
 
 #endif