gpu: nvgpu: use vpr resize API

This patch adds nvgpu API in linux and qnx to query vpr resize.
The new API nvgpu_is_vpr_resize_enabled() is used in
nvgpu_submit_channel_gpfifo().
Previously, if non-deterministic channel has timeout disabled and
GPU cannot railgate on some platform, then channel doesn't power ref
count and results in video freeze. This requires non-determinstic
channel job tracking to be enabled if vpr resize is supported or if GPU
can railgate.

Bug 200532122

Change-Id: Icfbff6253762b195b2f5955749343974b1a7a269
Signed-off-by: Vedashree Vidwans <vvidwans@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2167082
Reviewed-on: https://git-master.nvidia.com/r/2180581
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

6 files changed, 80 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index bec1809b..aad186ec 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -95,7 +95,8 @@ nvgpu-y += \
         os/linux/nvlink.o \
         os/linux/dt.o \
         os/linux/ecc_sysfs.o \
-        os/linux/ltc.o
+        os/linux/ltc.o \
+        os/linux/vpr.o
 
 nvgpu-$(CONFIG_GK20A_VIDMEM) += \
         os/linux/dmabuf_vidmem.o
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index 03bc8bcd..99f3b69b 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -44,6 +44,7 @@ srcs :=	os/posix/nvgpu.c \
         os/posix/nvlink.c \
         os/posix/lock.c \
         os/posix/stubs.c \
+        os/posix/posix-vpr.c \
         common/mm/nvgpu_allocator.c \
         common/mm/bitmap_allocator.c \
         common/mm/buddy_allocator.c \
diff --git a/drivers/gpu/nvgpu/common/fifo/submit.c b/drivers/gpu/nvgpu/common/fifo/submit.c
index 4effc663..d518fbfb 100644
--- a/drivers/gpu/nvgpu/common/fifo/submit.c
+++ b/drivers/gpu/nvgpu/common/fifo/submit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2018-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,6 +26,7 @@
 #include <nvgpu/os_sched.h>
 #include <nvgpu/utils.h>
 #include <nvgpu/channel_sync.h>
+#include <nvgpu/vpr.h>
 
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
 
@@ -387,6 +388,7 @@ static int nvgpu_submit_channel_gpfifo(struct channel_gk20a *c,
          *  - pre- or post-fence functionality
          *  - channel wdt
          *  - GPU rail-gating with non-deterministic channels
+         *  - VPR resize enabled with non-deterministic channels
          *  - buffer refcounting
          *
          * If none of the conditions are met, then job tracking is not
@@ -396,8 +398,9 @@ static int nvgpu_submit_channel_gpfifo(struct channel_gk20a *c,
         need_job_tracking = (flags & NVGPU_SUBMIT_FLAGS_FENCE_WAIT) ||
                         (flags & NVGPU_SUBMIT_FLAGS_FENCE_GET) ||
                         c->timeout.enabled ||
-                        (nvgpu_is_enabled(g, NVGPU_CAN_RAILGATE)
-                         && !c->deterministic) ||
+                        ((nvgpu_is_enabled(g, NVGPU_CAN_RAILGATE) ||
+                                nvgpu_is_vpr_resize_enabled()) &&
+                                !c->deterministic) ||
                         !skip_buffer_refcounting;
 
         if (need_job_tracking) {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vpr.h b/drivers/gpu/nvgpu/include/nvgpu/vpr.h
new file mode 100644
index 00000000..ae0ac1b4
--- /dev/null
+++ b/drivers/gpu/nvgpu/include/nvgpu/vpr.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2019, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef NVGPU_VPR_H
+#define NVGPU_VPR_H
+
+#include <nvgpu/types.h>
+
+bool nvgpu_is_vpr_resize_enabled(void);
+
+#endif /* NVGPU_VPR_H */
diff --git a/drivers/gpu/nvgpu/os/linux/vpr.c b/drivers/gpu/nvgpu/os/linux/vpr.c
new file mode 100644
index 00000000..3a981250
--- /dev/null
+++ b/drivers/gpu/nvgpu/os/linux/vpr.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2019, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#include <nvgpu/vpr.h>
+
+#include <linux/init.h>
+#include <linux/platform/tegra/common.h>
+
+bool nvgpu_is_vpr_resize_enabled(void)
+{
+        return tegra_is_vpr_resize_supported();
+}
diff --git a/drivers/gpu/nvgpu/os/posix/posix-vpr.c b/drivers/gpu/nvgpu/os/posix/posix-vpr.c
new file mode 100644
index 00000000..07486b1a
--- /dev/null
+++ b/drivers/gpu/nvgpu/os/posix/posix-vpr.c
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2019, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#include <nvgpu/vpr.h>
+
+bool nvgpu_is_vpr_resize_enabled(void)
+{
+        return false;
+}