support multibuffering with panning

it seems performance goes down to ~50% for some things without
multibuffering, weird..

diff --git a/pvr/omaplfb.h b/pvr/omaplfb.h
index 34e7a6d..72bffdb 100644 (file)
--- a/pvr/omaplfb.h
+++ b/pvr/omaplfb.h
@@ -107,6 +107,7 @@ struct OMAPLFB_DEVINFO {
        struct IMG_DEV_VIRTADDR sDisplayDevVAddr;
        struct fb_info *psLINFBInfo;
        struct notifier_block sLINNotifBlock;
        struct IMG_DEV_VIRTADDR sDisplayDevVAddr;
        struct fb_info *psLINFBInfo;
        struct notifier_block sLINNotifBlock;

+       struct fb_var_screeninfo local_var;

 };
 
 #define        OMAPLFB_PAGE_SIZE 4096
 };
 
 #define        OMAPLFB_PAGE_SIZE 4096

diff --git a/pvr/omaplfb_displayclass.c b/pvr/omaplfb_displayclass.c
index b9d023b..5fffc42 100644 (file)
--- a/pvr/omaplfb_displayclass.c
+++ b/pvr/omaplfb_displayclass.c
@@ -386,6 +386,25 @@ static enum PVRSRV_ERROR CreateDCSwapChain(void *hDevice, u32 ui32Flags,
 
        *phSwapChain = (void *) psSwapChain;
 
 
        *phSwapChain = (void *) psSwapChain;
 

+       i = psDevInfo->sFBInfo.ui32RoundedBufferSize * ui32BufferCount /
+               psDevInfo->sFBInfo.ui32ByteStride;
+       DEBUG_PRINTK((KERN_INFO DRIVER_PREFIX "%s: yres %u\n", __func__, i));
+
+       /* tell userspace that some amount of virtual res is used */
+       if (psDevInfo->psLINFBInfo->var.yres_virtual < i) {
+               int ret;
+
+               acquire_console_sem();
+               psDevInfo->psLINFBInfo->var.yres_virtual = i;
+               ret = fb_set_var(psDevInfo->psLINFBInfo,
+                       &psDevInfo->psLINFBInfo->var);
+               release_console_sem();
+               if (ret)
+                       printk(KERN_WARNING DRIVER_PREFIX
+                              ": fb_set_var failed (%d)", ret);
+       }
+       psDevInfo->local_var = psDevInfo->psLINFBInfo->var;
+

        return PVRSRV_OK;
 
 ErrorFreeBuffer:
        return PVRSRV_OK;
 
 ErrorFreeBuffer:


@@ -417,6 +436,12 @@ static enum PVRSRV_ERROR DestroyDCSwapChain(void *hDevice, void *hSwapChain)
 
        psDevInfo->psSwapChain = NULL;
 
 
        psDevInfo->psSwapChain = NULL;
 

+       acquire_console_sem();
+       psDevInfo->local_var.yoffset = 0;
+       psDevInfo->psLINFBInfo->fbops->fb_pan_display(
+               &psDevInfo->local_var, psDevInfo->psLINFBInfo);
+       release_console_sem();
+

        OMAPLFBFreeKernelMem(psSwapChain->psBuffer);
        OMAPLFBFreeKernelMem(psSwapChain);
 
        OMAPLFBFreeKernelMem(psSwapChain->psBuffer);
        OMAPLFBFreeKernelMem(psSwapChain);
 


@@ -492,6 +517,7 @@ static IMG_BOOL ProcessFlip(void *hCmdCookie, u32 ui32DataSize, void *pvData)
        struct OMAPLFB_DEVINFO *psDevInfo;
        struct OMAPLFB_BUFFER *psBuffer;
        struct OMAPLFB_SWAPCHAIN *psSwapChain;
        struct OMAPLFB_DEVINFO *psDevInfo;
        struct OMAPLFB_BUFFER *psBuffer;
        struct OMAPLFB_SWAPCHAIN *psSwapChain;

+       struct fb_info *fbi;

 
        if (!hCmdCookie || !pvData)
                return IMG_FALSE;
 
        if (!hCmdCookie || !pvData)
                return IMG_FALSE;


@@ -503,10 +529,19 @@ static IMG_BOOL ProcessFlip(void *hCmdCookie, u32 ui32DataSize, void *pvData)
                return IMG_FALSE;
 
        psDevInfo = (struct OMAPLFB_DEVINFO *)psFlipCmd->hExtDevice;
                return IMG_FALSE;
 
        psDevInfo = (struct OMAPLFB_DEVINFO *)psFlipCmd->hExtDevice;

+       fbi = psDevInfo->psLINFBInfo;

 
        psBuffer = (struct OMAPLFB_BUFFER *)psFlipCmd->hExtBuffer;
        psSwapChain = (struct OMAPLFB_SWAPCHAIN *)psFlipCmd->hExtSwapChain;
 
 
        psBuffer = (struct OMAPLFB_BUFFER *)psFlipCmd->hExtBuffer;
        psSwapChain = (struct OMAPLFB_SWAPCHAIN *)psFlipCmd->hExtSwapChain;
 

+       psDevInfo->local_var.yoffset =
+               (psBuffer->sCPUVAddr - psDevInfo->sFBInfo.sCPUVAddr)
+                / psDevInfo->sFBInfo.ui32ByteStride;
+
+       acquire_console_sem();
+       fbi->fbops->fb_pan_display(&psDevInfo->local_var, fbi);
+       release_console_sem();
+

        psSwapChain->psPVRJTable->pfnPVRSRVCmdComplete(hCmdCookie, IMG_TRUE);
 
        return IMG_TRUE;
        psSwapChain->psPVRJTable->pfnPVRSRVCmdComplete(hCmdCookie, IMG_TRUE);
 
        return IMG_TRUE;


@@ -573,6 +608,7 @@ static void SetDevinfo(struct OMAPLFB_DEVINFO *psDevInfo)
        psPVRFBInfo->ui32ByteStride = psLINFBInfo->fix.line_length;
        psPVRFBInfo->ui32FBSize = FBSize;
 
        psPVRFBInfo->ui32ByteStride = psLINFBInfo->fix.line_length;
        psPVRFBInfo->ui32FBSize = FBSize;
 

+#if 0

        /* Try double buffering */
        psPVRFBInfo->ui32Height = psLINFBInfo->var.yres_virtual >> 1;
        psPVRFBInfo->ui32BufferSize = psPVRFBInfo->ui32ByteStride *
        /* Try double buffering */
        psPVRFBInfo->ui32Height = psLINFBInfo->var.yres_virtual >> 1;
        psPVRFBInfo->ui32BufferSize = psPVRFBInfo->ui32ByteStride *


@@ -590,6 +626,18 @@ static void SetDevinfo(struct OMAPLFB_DEVINFO *psDevInfo)
                        sgx_buffer_align(psPVRFBInfo->ui32ByteStride,
                                         psPVRFBInfo->ui32BufferSize);
        }
                        sgx_buffer_align(psPVRFBInfo->ui32ByteStride,
                                         psPVRFBInfo->ui32BufferSize);
        }

+#else
+       psPVRFBInfo->ui32Height = psLINFBInfo->var.yres;
+       psPVRFBInfo->ui32BufferSize = psPVRFBInfo->ui32ByteStride *
+               psPVRFBInfo->ui32Height;
+       psPVRFBInfo->ui32RoundedBufferSize =
+               sgx_buffer_align(psPVRFBInfo->ui32ByteStride,
+                                psPVRFBInfo->ui32BufferSize);
+
+       DEBUG_PRINTK((KERN_INFO DRIVER_PREFIX
+                     ": buffer size: %u, rounded %u\n", psPVRFBInfo->ui32BufferSize,
+                         psPVRFBInfo->ui32RoundedBufferSize));
+#endif

 
        CalcSwapChainSize(psDevInfo);
 
 
        CalcSwapChainSize(psDevInfo);
 

diff --git a/pvr/omaplfb_linux.c b/pvr/omaplfb_linux.c
index b79a59e..c297bbc 100644 (file)
--- a/pvr/omaplfb_linux.c
+++ b/pvr/omaplfb_linux.c
@@ -32,6 +32,7 @@
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>

+#include <linux/fb.h>

 
 #include <linux/platform_device.h>
 
 
 #include <linux/platform_device.h>