MGS-4338-5 [#imx-1217] remove duplicate query code for debugfs

remove the duplicate code with gckGALDEVICE_QueryFrequency,
gckHARDWARE_QueryFrequency has correct fix for power management.

Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
index 2fd668a..8f8657f 100644 (file)
--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
@@ -70,10 +70,6 @@ static gckGALDEVICE galDevice;
 
 extern gcTA globalTA[16];
 
-gceSTATUS
-gckGALDEVICE_QueryFrequency( IN gckGALDEVICE Device);
-
-
 /******************************************************************************\
 ******************************** Debugfs Support *******************************
 \******************************************************************************/
@@ -702,8 +698,6 @@ static int gc_clk_show(struct seq_file* m, void* data)
     gckGALDEVICE device = node->device;
     gctUINT i;
 
-    gckGALDEVICE_QueryFrequency(device);
-
     for (i = gcvCORE_MAJOR; i < gcvCORE_COUNT; i++)
     {
         if (device->kernels[i])
@@ -716,6 +710,7 @@ static int gc_clk_show(struct seq_file* m, void* data)
                 continue;
             }
 #endif
+            gckHARDWARE_QueryFrequency(hardware);
 
             if (hardware->mcClk)
             {
@@ -2097,103 +2092,6 @@ gckGALDEVICE_Stop_Threads(
     return gcvSTATUS_OK;
 }
 
-/*******************************************************************************
-**
-**  gckGALDEVICE_QueryFrequency
-**
-**  Query frequency for all the hardwares.
-**
-*/
-gceSTATUS
-gckGALDEVICE_QueryFrequency(
-    IN gckGALDEVICE Device
-    )
-{
-    gctUINT64 mcStart[gcvCORE_COUNT] = { 0 }, shStart[gcvCORE_COUNT];
-    gctUINT32 mcClk[gcvCORE_COUNT], shClk[gcvCORE_COUNT];
-    gckHARDWARE hardware = gcvNULL;
-    gceSTATUS status;
-    gctUINT i;
-
-    gcmkHEADER_ARG("Device=0x%p", Device);
-
-    for (i = gcvCORE_MAJOR; i < gcvCORE_COUNT; i++)
-    {
-#if gcdENABLE_VG
-        if (i == gcvCORE_VG)
-        {
-            continue;
-        }
-#endif
-
-        if (Device->kernels[i])
-        {
-            hardware = Device->kernels[i]->hardware;
-
-            mcStart[i] = shStart[i] = 0;
-
-            if (Device->args.powerManagement)
-            {
-                gcmkONERROR(gckHARDWARE_SetPowerManagement(
-                    hardware, gcvFALSE
-                    ));
-            }
-
-            gcmkONERROR(gckHARDWARE_SetPowerManagementState(
-                hardware, gcvPOWER_ON_AUTO
-                ));
-
-            gckHARDWARE_EnterQueryClock(hardware,
-                                        &mcStart[i], &shStart[i]);
-        }
-    }
-
-    gcmkONERROR(gckOS_Delay(Device->os, 50));
-
-    for (i = gcvCORE_MAJOR; i < gcvCORE_COUNT; i++)
-    {
-        mcClk[i] = shClk[i] = 0;
-
-#if gcdENABLE_VG
-        if (i == gcvCORE_VG)
-        {
-            continue;
-        }
-#endif
-
-        if (Device->kernels[i])
-        {
-            hardware = Device->kernels[i]->hardware;
-
-            if (mcStart[i])
-            {
-                gckHARDWARE_ExitQueryClock(hardware,
-                                           mcStart[i], shStart[i],
-                                           &mcClk[i], &shClk[i]);
-            }
-
-            hardware->mcClk = mcClk[i];
-            hardware->shClk = shClk[i];
-
-            if (Device->args.powerManagement)
-            {
-                gcmkONERROR(gckHARDWARE_SetPowerManagement(
-                    hardware, gcvTRUE
-                    ));
-            }
-        }
-    }
-
-    gcmkFOOTER_NO();
-
-    return gcvSTATUS_OK;
-
-OnError:
-    gcmkFOOTER();
-
-    return status;
-}
-
 /*******************************************************************************
 **
 **  gckGALDEVICE_Start