MGS-6400 [#imx-1870] fix vivante drm database leak

contiguous memory is part of video memory allocation,
remove the duplicated database for contiguous memory,
need set contiguous memory flag as database type.

Signed-off-by: Xianzhong <xianzhong.li@nxp.com>

drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_drm.c

@@ -665,6 +665,7 @@ static int viv_ioctl_gem_ref_node(struct drm_device *drm, void *data,
     gckKERNEL kernel = gcvNULL;
     gctUINT32 processID;
     gckVIDMEM_NODE nodeObj;
+    gceDATABASE_TYPE type;
     gctUINT32 nodeHandle = 0, tsNodeHandle = 0;
     gctBOOL refered = gcvFALSE;
     gctBOOL isContiguous = gcvFALSE;
@@ -687,50 +688,44 @@ static int viv_ioctl_gem_ref_node(struct drm_device *drm, void *data,
 
     gcmkONERROR(gckOS_GetProcessID(&processID));
     gcmkONERROR(gckVIDMEM_HANDLE_Allocate(kernel, nodeObj, &nodeHandle));
+
+    type = gcvDB_VIDEO_MEMORY
+         | (nodeObj->type << gcdDB_VIDEO_MEMORY_TYPE_SHIFT)
+         | (nodeObj->pool << gcdDB_VIDEO_MEMORY_POOL_SHIFT);
+
+    gcmkONERROR(gckVIDMEM_NODE_IsContiguous(kernel, nodeObj, &isContiguous));
+    if (isContiguous)
+    {
+        type |= (gcvDB_CONTIGUOUS << gcdDB_VIDEO_MEMORY_DBTYPE_SHIFT);
+    }
     gcmkONERROR(
         gckKERNEL_AddProcessDB(kernel,
-                               processID, gcvDB_VIDEO_MEMORY,
+                               processID, type,
                                gcmINT2PTR(nodeHandle),
                                gcvNULL,
                                0));
     gcmkONERROR(gckVIDMEM_NODE_Reference(kernel, nodeObj));
     refered = gcvTRUE;
-    gcmkONERROR(gckVIDMEM_NODE_IsContiguous(kernel, nodeObj, &isContiguous));
-
-    if (isContiguous)
-    {
-        /* Record in process db. */
-        gcmkONERROR(
-                gckKERNEL_AddProcessDB(kernel,
-                                       processID,
-                                       gcvDB_CONTIGUOUS,
-                                       gcmINT2PTR(nodeHandle),
-                                       gcvNULL,
-                                       0));
-    }
     if (nodeObj->tsNode)
     {
+        type = gcvDB_VIDEO_MEMORY
+             | (nodeObj->tsNode->type << gcdDB_VIDEO_MEMORY_TYPE_SHIFT)
+             | (nodeObj->tsNode->pool << gcdDB_VIDEO_MEMORY_POOL_SHIFT);
+
+        gcmkONERROR(gckVIDMEM_NODE_IsContiguous(kernel, nodeObj->tsNode, &isContiguous));
+        if (isContiguous)
+        {
+            type |= (gcvDB_CONTIGUOUS << gcdDB_VIDEO_MEMORY_DBTYPE_SHIFT);
+        }
+
         gcmkONERROR(gckVIDMEM_HANDLE_Allocate(kernel, nodeObj->tsNode, &tsNodeHandle));
         gcmkONERROR(
             gckKERNEL_AddProcessDB(kernel,
-                                   processID, gcvDB_VIDEO_MEMORY,
+                                   processID, type,
                                    gcmINT2PTR(tsNodeHandle),
                                    gcvNULL,
                                    0));
         gcmkONERROR(gckVIDMEM_NODE_Reference(kernel, nodeObj->tsNode));
-        gcmkONERROR(gckVIDMEM_NODE_IsContiguous(kernel, nodeObj->tsNode, &isContiguous));
-
-        if (isContiguous)
-        {
-               /* Record in process db. */
-                gcmkONERROR(
-                       gckKERNEL_AddProcessDB(kernel,
-                                              processID,
-                                              gcvDB_CONTIGUOUS,
-                                              gcmINT2PTR(tsNodeHandle),
-                                              gcvNULL,
-                                              0));
-        }
     }
     args->node = nodeHandle;
     args->ts_node = tsNodeHandle;