From 2e0badcefe9b3ba9f40c04c66bb46c6ffc67d023 Mon Sep 17 00:00:00 2001
From: Deepak Nibade <dnibade@nvidia.com>
Date: Fri, 12 Apr 2019 17:26:13 +0530
Subject: [PATCH] gpu: nvgpu: move NVGPU_OBJ_CTX_FLAGS_* to gr.obj_ctx header

Move below #define's to gr.obj_ctx header file
NVGPU_OBJ_CTX_FLAGS_SUPPORT_GFXP
NVGPU_OBJ_CTX_FLAGS_SUPPORT_CILP

Jira NVGPU-3112

Change-Id: I378c46d1da86278d88c91336f7f419448e57f2af
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2098508
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/gk20a/gr_gk20a.h           | 4 ----
 drivers/gpu/nvgpu/include/nvgpu/gr/obj_ctx.h | 3 +++
 drivers/gpu/nvgpu/os/linux/ioctl_channel.c   | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 5838a5785..cc880abe2 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -35,10 +35,6 @@
 
 #define GK20A_TIMEOUT_FPGA		100000U /* 100 sec */
 
-/* Flags to be passed to g->ops.gr.alloc_obj_ctx() */
-#define NVGPU_OBJ_CTX_FLAGS_SUPPORT_GFXP		BIT32(1)
-#define NVGPU_OBJ_CTX_FLAGS_SUPPORT_CILP		BIT32(2)
-
 struct tsg_gk20a;
 struct nvgpu_gr_ctx;
 struct channel_gk20a;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gr/obj_ctx.h b/drivers/gpu/nvgpu/include/nvgpu/gr/obj_ctx.h
index 42e1cc7a5..9f620be84 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gr/obj_ctx.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gr/obj_ctx.h
@@ -26,6 +26,9 @@
 #include <nvgpu/types.h>
 #include <nvgpu/lock.h>
 
+#define NVGPU_OBJ_CTX_FLAGS_SUPPORT_GFXP		BIT32(1)
+#define NVGPU_OBJ_CTX_FLAGS_SUPPORT_CILP		BIT32(2)
+
 struct gk20a;
 struct nvgpu_gr_ctx;
 struct nvgpu_gr_subctx;
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_channel.c b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c
index f79b0be57..01b00aa70 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c
@@ -40,6 +40,7 @@
 #include <nvgpu/channel_sync_syncpt.h>
 #include <nvgpu/runlist.h>
 #include <nvgpu/gr/ctx.h>
+#include <nvgpu/gr/obj_ctx.h>
 #include <nvgpu/fence.h>
 
 #include "platform_gk20a.h"