gpu: nvgpu: remove freeing of unused pointer for mclk

mclk is not enabled yet for IGPUs and as such we donot allocate memory
and incorrectly free them in gp10b_clk_arb_cleanup. This is corrected
by removing the freeing of the mclk pointers in gp10b_clk_arb_cleanup.

As an addon also change gk20a/gk20a.h to <nvgpu/gk20a.h> in
clk_arb_gp10b.c

Bug 2061372

Change-Id: I3bba20443b9ef7beb88251779edd67a32f6c9d20
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1836553
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: Prateek Sethi <prsethi@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/clk_arb_gp10b.c b/drivers/gpu/nvgpu/gp10b/clk_arb_gp10b.c
index 78fb1261..7a465fee 100644
--- a/drivers/gpu/nvgpu/gp10b/clk_arb_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/clk_arb_gp10b.c
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 #include <nvgpu/clk_arb.h>
 
 #include "clk_arb_gp10b.h"
@@ -407,12 +407,10 @@ void gp10b_clk_arb_cleanup(struct nvgpu_clk_arb *arb)
         int index;
 
         nvgpu_kfree(g, arb->gpc2clk_f_points);
-        nvgpu_kfree(g, arb->mclk_f_points);
 
         for (index = 0; index < 2; index++) {
                 nvgpu_kfree(g,
                         arb->vf_table_pool[index].gpc2clk_points);
-                nvgpu_kfree(g, arb->vf_table_pool[index].mclk_points);
         }
 
         nvgpu_mutex_destroy(&g->clk_arb->pstate_lock);