gpu: pvr: get rid of unnecessary hash lookups for the proc object

We already are passed a pointer to the process specific data, so no
need to do an extra hash lookup just for this purpose.

Note that this lookup overhead was incured in each IOCTL command.

Signed-off-by: Imre Deak <imre.deak@nokia.com>
Reviewed-by: Luc Verhaegen <libv@codethink.co.uk>

diff --git a/pvr/module.c b/pvr/module.c
index 7543579..da8e944 100644 (file)
--- a/pvr/module.c
+++ b/pvr/module.c
@@ -95,6 +95,7 @@ static int pvr_open(struct inode unref__ * inode, struct file *filp)
 
        priv->ui32OpenPID = pid;
        priv->hBlockAlloc = block_alloc;
+       priv->proc = PVRSRVPerProcessData(pid);
        filp->private_data = priv;
 
        INIT_LIST_HEAD(&priv->event_list);

diff --git a/pvr/private_data.h b/pvr/private_data.h
index b91b838..209134f 100644 (file)
--- a/pvr/private_data.h
+++ b/pvr/private_data.h
@@ -33,6 +33,7 @@
 struct PVRSRV_FILE_PRIVATE_DATA {
        u32 ui32OpenPID;
        void *hBlockAlloc;
+       struct PVRSRV_PER_PROCESS_DATA *proc;
 
        wait_queue_head_t event_wait;
        struct list_head event_list;

diff --git a/pvr/pvr_bridge_k.c b/pvr/pvr_bridge_k.c
index 4cbc041..7489f65 100644 (file)
--- a/pvr/pvr_bridge_k.c
+++ b/pvr/pvr_bridge_k.c
@@ -173,6 +173,7 @@ long PVRSRV_BridgeDispatchKM(struct file *filp, unsigned int cmd,
            (struct PVRSRV_BRIDGE_PACKAGE __user *)arg;
        struct PVRSRV_BRIDGE_PACKAGE sBridgePackageKM;
        u32 ui32PID = OSGetCurrentProcessIDKM();
+       struct PVRSRV_FILE_PRIVATE_DATA *priv;
        struct PVRSRV_PER_PROCESS_DATA *psPerProc;
        int err = -EFAULT;
 
@@ -196,21 +197,12 @@ long PVRSRV_BridgeDispatchKM(struct file *filp, unsigned int cmd,
                           sizeof(struct PVRSRV_BRIDGE_PACKAGE)) != PVRSRV_OK)
                goto unlock_and_return;
 
+       priv = filp->private_data;
+       psPerProc = priv->proc;
+       BUG_ON(!psPerProc);
+
        if (ui32BridgeID !=
            PVRSRV_GET_BRIDGE_ID(PVRSRV_BRIDGE_CONNECT_SERVICES)) {
-               enum PVRSRV_ERROR eError;
-
-               eError = PVRSRVLookupHandle(KERNEL_HANDLE_BASE,
-                                           (void **)&psPerProc,
-                                           sBridgePackageKM.hKernelServices,
-                                           PVRSRV_HANDLE_TYPE_PERPROC_DATA);
-               if (eError != PVRSRV_OK) {
-                       PVR_DPF(PVR_DBG_ERROR,
-                                "%s: Invalid kernel services handle (%d)",
-                                __func__, eError);
-                       goto unlock_and_return;
-               }
-
                if (psPerProc->ui32PID != ui32PID) {
                        PVR_DPF(PVR_DBG_ERROR,
                                 "%s: Process %d tried to access data "
@@ -218,13 +210,6 @@ long PVRSRV_BridgeDispatchKM(struct file *filp, unsigned int cmd,
                                 ui32PID, psPerProc->ui32PID);
                        goto unlock_and_return;
                }
-       } else {
-               psPerProc = PVRSRVPerProcessData(ui32PID);
-               if (psPerProc == NULL) {
-                       PVR_DPF(PVR_DBG_ERROR, "PVRSRV_BridgeDispatchKM: "
-                                "Couldn't create per-process data area");
-                       goto unlock_and_return;
-               }
        }
 
        sBridgePackageKM.ui32BridgeID = PVRSRV_GET_BRIDGE_ID(