gpu: nvgpu: remove gr_priv.h dependnecy from hal gr falcon

Removed gr_priv.h dependency in gr_falcon by using gr_utils.h
API for getting nvgpu_gr_falcon pointer.

JIRA NVGPU-3218

Change-Id: I4f02e8f76b13312b024ff95bf22019725fcf4c98
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2120693
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Seshendra Gadagottu
2019-05-16 18:43:55 -07:00
committed by mobile promotions
parent e140d72ff8
commit 5fce81ea6d

View File

@@ -29,7 +29,7 @@
#include "gr_falcon_gm20b.h"
#include "common/gr/gr_falcon_priv.h"
#include "common/gr/gr_priv.h"
#include <nvgpu/gr/gr_utils.h>
#include <nvgpu/hw/gm20b/hw_gr_gm20b.h>
@@ -754,9 +754,9 @@ int gm20b_gr_falcon_submit_fecs_method_op(struct gk20a *g,
bool sleepduringwait)
{
int ret;
struct nvgpu_gr *gr = g->gr;
struct nvgpu_gr_falcon *gr_falcon = nvgpu_gr_get_falcon_ptr(g);
nvgpu_mutex_acquire(&gr->falcon->fecs_mutex);
nvgpu_mutex_acquire(&gr_falcon->fecs_mutex);
if (op.mailbox.id != 0U) {
nvgpu_writel(g, gr_fecs_ctxsw_mailbox_r(op.mailbox.id),
@@ -786,7 +786,7 @@ int gm20b_gr_falcon_submit_fecs_method_op(struct gk20a *g,
op.method.data, op.method.addr);
}
nvgpu_mutex_release(&gr->falcon->fecs_mutex);
nvgpu_mutex_release(&gr_falcon->fecs_mutex);
return ret;
}
@@ -796,9 +796,9 @@ int gm20b_gr_falcon_submit_fecs_sideband_method_op(struct gk20a *g,
struct nvgpu_fecs_method_op op)
{
int ret;
struct nvgpu_gr *gr = g->gr;
struct nvgpu_gr_falcon *gr_falcon = nvgpu_gr_get_falcon_ptr(g);
nvgpu_mutex_acquire(&gr->falcon->fecs_mutex);
nvgpu_mutex_acquire(&gr_falcon->fecs_mutex);
nvgpu_writel(g, gr_fecs_ctxsw_mailbox_clear_r(op.mailbox.id),
gr_fecs_ctxsw_mailbox_clear_value_f(op.mailbox.clr));
@@ -816,7 +816,7 @@ int gm20b_gr_falcon_submit_fecs_sideband_method_op(struct gk20a *g,
op.method.data, op.method.addr);
}
nvgpu_mutex_release(&gr->falcon->fecs_mutex);
nvgpu_mutex_release(&gr_falcon->fecs_mutex);
return ret;
}