RK3368 GPU version: L0.12

1. Instead kmalloc to kzalloc.
2. Clear cleanup_sync in pvr_sync_clean_freelist.

diff --git a/drivers/gpu/rogue/dc_fbdev/dc_fbdev.c b/drivers/gpu/rogue/dc_fbdev/dc_fbdev.c
index c8f5e3de0a0d90c085ef8d3ecd166b8faa2ba640..3addd28d8c2a035857dd2d8819549148dcc77961 100755 (executable)
--- a/drivers/gpu/rogue/dc_fbdev/dc_fbdev.c
+++ b/drivers/gpu/rogue/dc_fbdev/dc_fbdev.c
@@ -508,7 +508,7 @@ PVRSRV_ERROR DC_FBDEV_BufferAlloc(IMG_HANDLE hDisplayContext,
                goto err_out;
        }
 
-       psBuffer = kmalloc(sizeof(DC_FBDEV_BUFFER), GFP_KERNEL);
+       psBuffer = kzalloc(sizeof(DC_FBDEV_BUFFER), GFP_KERNEL);
        if (!psBuffer)
        {
                eError = PVRSRV_ERROR_OUT_OF_MEMORY;
@@ -827,7 +827,7 @@ static int __init DC_FBDEV_init(void)
                goto err_module_put;
        }
 
-       gpsDeviceData = kmalloc(sizeof(DC_FBDEV_DEVICE), GFP_KERNEL);
+       gpsDeviceData = kzalloc(sizeof(DC_FBDEV_DEVICE), GFP_KERNEL);
        if(!gpsDeviceData)
                goto err_module_put;
 

diff --git a/drivers/gpu/rogue/include/pvrversion.h b/drivers/gpu/rogue/include/pvrversion.h
index 2690ecd705373ae1aea30b521d343fbb055e40d8..ddb532b491cd4af3b47d039bd81a5581de3f0b2b 100755 (executable)
--- a/drivers/gpu/rogue/include/pvrversion.h
+++ b/drivers/gpu/rogue/include/pvrversion.h
@@ -70,5 +70,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define PVRVERSION_UNPACK_MIN(VERSION) (((VERSION) >> 0) & 0xFFFF)
 
 //chenli:define rockchip version
-#define RKVERSION                   "L 0.11"
+#define RKVERSION                   "L 0.12"
 #endif /* _PVRVERSION_H_ */

diff --git a/drivers/gpu/rogue/kernel/drivers/staging/imgtec/adf_pdp.c b/drivers/gpu/rogue/kernel/drivers/staging/imgtec/adf_pdp.c
index 8a325e14557bf9574b2ed49a173b24ff00bcc898..ce0aa1b5af38b90b33dc53046092e14782af16d2 100644 (file)
--- a/drivers/gpu/rogue/kernel/drivers/staging/imgtec/adf_pdp.c
+++ b/drivers/gpu/rogue/kernel/drivers/staging/imgtec/adf_pdp.c
@@ -861,7 +861,7 @@ static int pdp_validate(struct adf_device *dev, struct adf_post *cfg,
                 * handle cases e.g. during fence timeouts where validates
                 * are called without corresponding posts.
                 */
-               int *validates = kmalloc(sizeof(int), GFP_KERNEL);
+               int *validates = kzalloc(sizeof(int), GFP_KERNEL);
                *validates = atomic_inc_return(&pdp->num_validates);
                *driver_state = validates;
        } else {

diff --git a/drivers/gpu/rogue/kernel/drivers/staging/imgtec/pvr_sync.c b/drivers/gpu/rogue/kernel/drivers/staging/imgtec/pvr_sync.c
index 31cab2e359b023b5018f4a5d02580bad9126db35..68c14e601f07e322b799a5cd51b805a1ec03c3e8 100644 (file)
--- a/drivers/gpu/rogue/kernel/drivers/staging/imgtec/pvr_sync.c
+++ b/drivers/gpu/rogue/kernel/drivers/staging/imgtec/pvr_sync.c
@@ -394,7 +394,7 @@ sync_pool_get(struct pvr_sync_native_sync_prim **_sync,
 
        if (list_empty(&sync_pool_free_list)) {
                /* If there is nothing in the pool, create a new sync prim. */
-               sync = kmalloc(sizeof(struct pvr_sync_native_sync_prim),
+               sync = kzalloc(sizeof(struct pvr_sync_native_sync_prim),
                               GFP_KERNEL);
                if (!sync) {
                        pr_err("pvr_sync: %s: Failed to allocate sync data",
@@ -859,14 +859,14 @@ pvr_sync_create_waiter_for_foreign_sync(int fd)
                goto err_out;
        }
 
-       kernel = kmalloc(sizeof(struct pvr_sync_kernel_pair), GFP_KERNEL);
+       kernel = kzalloc(sizeof(struct pvr_sync_kernel_pair), GFP_KERNEL);
        if (!kernel) {
                pr_err("pvr_sync: %s: Failed to allocate sync kernel",
                       __func__);
                goto err_put_fence;
        }
 
-       sync_fence = kmalloc(sizeof(struct pvr_sync_fence), GFP_KERNEL);
+       sync_fence = kzalloc(sizeof(struct pvr_sync_fence), GFP_KERNEL);
        if (!sync_fence) {
                pr_err("pvr_sync: %s: Failed to allocate pvr sync fence",
                       __func__);
@@ -896,7 +896,7 @@ pvr_sync_create_waiter_for_foreign_sync(int fd)
        kernel->cleanup_sync->next_value++;
 
        /* The custom waiter structure is freed in the waiter callback */
-       waiter = kmalloc(sizeof(struct pvr_sync_fence_waiter), GFP_KERNEL);
+       waiter = kzalloc(sizeof(struct pvr_sync_fence_waiter), GFP_KERNEL);
        if (!waiter) {
                pr_err("pvr_sync: %s: Failed to allocate waiter", __func__);
                goto err_free_cleanup_sync;
@@ -1804,6 +1804,7 @@ pvr_sync_clean_freelist(void)
                        continue;
                }
 
+        kernel->cleanup_sync=NULL;
                /* Remove the entry from the free list. */
                list_move_tail(&kernel->list, &unlocked_free_list);
        }
@@ -1947,7 +1948,7 @@ void pvr_sync_update_all_timelines(void *command_complete_handle)
 
                if (signal) {
                        timeline_to_signal =
-                               kmalloc(sizeof(struct pvr_sync_tl_to_signal),
+                               kzalloc(sizeof(struct pvr_sync_tl_to_signal),
                                        GFP_KERNEL);
                        if (!timeline_to_signal)
                                break;

diff --git a/drivers/gpu/rogue/services/include/shared/lock.h b/drivers/gpu/rogue/services/include/shared/lock.h
index d581614b72f68dd95b2f1bdd8a8b5a0598bcccd1..b74aab372f9be271056b92f5a3e64e39b4ac7155 100644 (file)
--- a/drivers/gpu/rogue/services/include/shared/lock.h
+++ b/drivers/gpu/rogue/services/include/shared/lock.h
@@ -56,7 +56,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define OSLockCreate(phLock, eLockType) ({ \
        PVRSRV_ERROR e = PVRSRV_ERROR_OUT_OF_MEMORY; \
-       *(phLock) = kmalloc(sizeof(struct mutex), GFP_KERNEL); \
+       *(phLock) = kzalloc(sizeof(struct mutex), GFP_KERNEL); \
        if (*(phLock)) { mutex_init(*(phLock)); e = PVRSRV_OK; }; \
        e;})
 #define OSLockDestroy(hLock) ({mutex_destroy((hLock)); kfree((hLock)); PVRSRV_OK;})

diff --git a/drivers/gpu/rogue/services/server/env/linux/allocmem.c b/drivers/gpu/rogue/services/server/env/linux/allocmem.c
index 214b15ad694af708f4866a6235f2ee65c3f7a6f8..b3be78bdc8f5fb43a9d1df8457cabb29fffa6ebe 100644 (file)
--- a/drivers/gpu/rogue/services/server/env/linux/allocmem.c
+++ b/drivers/gpu/rogue/services/server/env/linux/allocmem.c
@@ -61,7 +61,7 @@ IMG_INTERNAL IMG_PVOID OSAllocMem(IMG_UINT32 ui32Size)
        }
        else
        {
-               pvRet = kmalloc(ui32Size, GFP_KERNEL);
+               pvRet = kzalloc(ui32Size, GFP_KERNEL);
        }
 
 #if defined(PVRSRV_ENABLE_PROCESS_STATS)
@@ -110,7 +110,7 @@ IMG_INTERNAL IMG_PVOID OSAllocMem(IMG_UINT32 ui32Size)
 }
 IMG_INTERNAL IMG_PVOID OSAllocMemstatMem(IMG_UINT32 ui32Size)
 {
-    IMG_PVOID pvRet = kmalloc(ui32Size, GFP_KERNEL);
+    IMG_PVOID pvRet = kzalloc(ui32Size, GFP_KERNEL);
 
        return pvRet;
 }

diff --git a/drivers/gpu/rogue/services/server/env/linux/osfunc.c b/drivers/gpu/rogue/services/server/env/linux/osfunc.c
index 66455008cd9e91b3ac8da6bfdaa15c72589c0d15..711a1afec11d2147120a4e286d3a2da58894a51a 100644 (file)
--- a/drivers/gpu/rogue/services/server/env/linux/osfunc.c
+++ b/drivers/gpu/rogue/services/server/env/linux/osfunc.c
@@ -766,7 +766,7 @@ PVRSRV_ERROR OSInstallDeviceLISR(PVRSRV_DEVICE_CONFIG *psDevConfig,
        LISR_DATA *psLISRData;
        unsigned long flags = 0;
 
-       psLISRData = kmalloc(sizeof(LISR_DATA), GFP_KERNEL);
+       psLISRData = kzalloc(sizeof(LISR_DATA), GFP_KERNEL);
 
        psLISRData->pfnLISR = pfnLISR;
        psLISRData->pvData = pvData;
@@ -847,7 +847,7 @@ PVRSRV_ERROR OSInstallMISR(IMG_HANDLE *hMISRData, PFN_MISR pfnMISR,
 {
        MISR_DATA *psMISRData;
 
-       psMISRData = kmalloc(sizeof(MISR_DATA), GFP_KERNEL);
+       psMISRData = kzalloc(sizeof(MISR_DATA), GFP_KERNEL);
        if (psMISRData == NULL)
        {
                return PVRSRV_ERROR_OUT_OF_MEMORY;
@@ -935,7 +935,7 @@ PVRSRV_ERROR OSInstallMISR(IMG_HANDLE *hMISRData, PFN_MISR pfnMISR, void *hData)
 {
        MISR_DATA *psMISRData;
 
-       psMISRData = kmalloc(sizeof(MISR_DATA), GFP_KERNEL);
+       psMISRData = kzalloc(sizeof(MISR_DATA), GFP_KERNEL);
        if (psMISRData == NULL)
        {
                return PVRSRV_ERROR_OUT_OF_MEMORY;
@@ -1006,7 +1006,7 @@ PVRSRV_ERROR OSInstallMISR(IMG_HANDLE *hMISRData, PFN_MISR pfnMISR, void *hData)
 {
        MISR_DATA *psMISRData;
 
-       psMISRData = kmalloc(sizeof(MISR_DATA), GFP_KERNEL);
+       psMISRData = kzalloc(sizeof(MISR_DATA), GFP_KERNEL);
        if (psMISRData == NULL)
        {
                return PVRSRV_ERROR_OUT_OF_MEMORY;
@@ -1110,7 +1110,7 @@ PVRSRV_ERROR OSThreadCreatePriority(IMG_HANDLE *phThread,
        OSThreadData *psOSThreadData;
        PVRSRV_ERROR eError;
 
-       psOSThreadData = kmalloc(sizeof(OSThreadData), GFP_KERNEL);
+       psOSThreadData = kzalloc(sizeof(OSThreadData), GFP_KERNEL);
        if (psOSThreadData == IMG_NULL)
        {
                eError = PVRSRV_ERROR_OUT_OF_MEMORY;
@@ -1878,7 +1878,7 @@ PVRSRV_ERROR OSWRLockCreate(POSWR_LOCK *ppsLock)
 {
        POSWR_LOCK psLock;
 
-       psLock = kmalloc(sizeof(*psLock), GFP_KERNEL);
+       psLock = kzalloc(sizeof(*psLock), GFP_KERNEL);
        if (psLock == NULL)
        {
                return PVRSRV_ERROR_OUT_OF_MEMORY;

diff --git a/drivers/gpu/rogue/services/server/env/linux/pvr_debugfs.c b/drivers/gpu/rogue/services/server/env/linux/pvr_debugfs.c
index 044622cda23d5f7eb331cdc5be8a02cebe7c320e..ffe114ef7984dc9367e1b761114f37e6b5d39b10 100644 (file)
--- a/drivers/gpu/rogue/services/server/env/linux/pvr_debugfs.c
+++ b/drivers/gpu/rogue/services/server/env/linux/pvr_debugfs.c
@@ -313,7 +313,7 @@ int PVRDebugFSCreateEntry(const char *pszName,
 
        PVR_ASSERT(gpsPVRDebugFSEntryDir != NULL);
 
-       psPrivData = kmalloc(sizeof(*psPrivData), GFP_KERNEL);
+       psPrivData = kzalloc(sizeof(*psPrivData), GFP_KERNEL);
        if (psPrivData == NULL)
        {
                return -ENOMEM;

diff --git a/drivers/gpu/rogue/system/common/pci_support.c b/drivers/gpu/rogue/system/common/pci_support.c
index 6374ff5763172227f0b1c7591b210925e193433a..027a3c51359e4da7d57468c08d146b0c8e895e96 100644 (file)
--- a/drivers/gpu/rogue/system/common/pci_support.c
+++ b/drivers/gpu/rogue/system/common/pci_support.c
@@ -65,7 +65,7 @@ PVRSRV_PCI_DEV_HANDLE OSPCISetDev(IMG_VOID *pvPCICookie, HOST_PCI_INIT_FLAGS eFl
        IMG_UINT32 i;
        PVR_PCI_DEV *psPVRPCI;
 
-       psPVRPCI = kmalloc(sizeof(*psPVRPCI), GFP_KERNEL);
+       psPVRPCI = kzalloc(sizeof(*psPVRPCI), GFP_KERNEL);
        if (psPVRPCI == IMG_NULL)
        {
                printk(KERN_ERR "OSPCISetDev: Couldn't allocate PVR PCI structure\n");

diff --git a/drivers/gpu/rogue/system/rk3368/rk_init.c b/drivers/gpu/rogue/system/rk3368/rk_init.c
index 64d88710b03d2c4192d02ec2139fd3384bbafc24..1c0ff3b517ad4f590e030cf261766fe1127889ab 100755 (executable)
--- a/drivers/gpu/rogue/system/rk3368/rk_init.c
+++ b/drivers/gpu/rogue/system/rk3368/rk_init.c
@@ -1754,7 +1754,7 @@ IMG_VOID RgxRkInit(IMG_VOID)
 
     if (NULL == platform)
     {
-        PVR_DPF((PVR_DBG_ERROR, "RgxRkInit: Failed to kmalloc rk_context"));
+        PVR_DPF((PVR_DBG_ERROR, "RgxRkInit: Failed to kzalloc rk_context"));
         return;
     }
 

diff --git a/drivers/gpu/rogue/tools/services/debug/dbgdriv/linux/hostfunc.c b/drivers/gpu/rogue/tools/services/debug/dbgdriv/linux/hostfunc.c
index 578d77b4f25826aecdb526b2dd275e0a1209b441..012b20ac5d123ad94c541610ae75a30a5970b550 100644 (file)
--- a/drivers/gpu/rogue/tools/services/debug/dbgdriv/linux/hostfunc.c
+++ b/drivers/gpu/rogue/tools/services/debug/dbgdriv/linux/hostfunc.c
@@ -289,7 +289,7 @@ IMG_VOID *HostCreateMutex(IMG_VOID)
 {
        MUTEX *psMutex;
 
-       psMutex = kmalloc(sizeof(*psMutex), GFP_KERNEL);
+       psMutex = kzalloc(sizeof(*psMutex), GFP_KERNEL);
        if (psMutex)
        {
                INIT_MUTEX(psMutex);