gpu: nvgpu: Prepare for per-GPU CDE program numbers

Add gpu_ops for CDE, and add get_program_numbers function pointer for
determining horizontal and vertical CDE swizzler programs. This allows
different GPUs to have their own specific requirements for choosing
the CDE firmware programs.

Bug 1604102

Change-Id: Ib37c13abb017c8eb1c32adc8cbc6b5984488222e
Signed-off-by: Sami Kiminki <skiminki@nvidia.com>
Reviewed-on: http://git-master/r/784899
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

2 files changed, 19 insertions, 22 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
index dc7e8be3..84b39b2d 100644
--- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
@@ -1259,17 +1259,6 @@ enum cde_launch_patch_id {
         PATCH_V_QMD_REGISTER_COUNT_ID       = 1056,
 };
 
-enum programs {
-        PROG_HPASS              = 0,
-        PROG_VPASS_LARGE        = 1,
-        PROG_VPASS_SMALL        = 2,
-        PROG_HPASS_DEBUG        = 3,
-        PROG_VPASS_LARGE_DEBUG  = 4,
-        PROG_VPASS_SMALL_DEBUG  = 5,
-        PROG_PASSTHROUGH        = 6,
-        NUM_PROGRAMS            = 7
-};
-
 /* maximum number of WRITE_PATCHes in the below function */
 #define MAX_CDE_LAUNCH_PATCHES            32
 
@@ -1301,17 +1290,20 @@ static int gk20a_buffer_convert_gpu_to_cde_v1(
         const int xblocks = (xtiles + 1) >> 1;
         const int voffset = compbits_voffset - compbits_hoffset;
 
-        int hprog = PROG_HPASS;
-        int vprog = (block_height_log2 >= 2) ?
-                PROG_VPASS_LARGE : PROG_VPASS_SMALL;
-        if (g->cde_app.shader_parameter == 1) {
-                hprog = PROG_PASSTHROUGH;
-                vprog = PROG_PASSTHROUGH;
-        } else if (g->cde_app.shader_parameter == 2) {
-                hprog = PROG_HPASS_DEBUG;
-                vprog = (block_height_log2 >= 2) ?
-                        PROG_VPASS_LARGE_DEBUG :
-                        PROG_VPASS_SMALL_DEBUG;
+        int hprog = -1;
+        int vprog = -1;
+
+        if (g->ops.cde.get_program_numbers)
+                g->ops.cde.get_program_numbers(g, block_height_log2,
+                                               &hprog, &vprog);
+        else {
+                gk20a_warn(&g->dev->dev, "cde: chip not supported");
+                return -ENOSYS;
+        }
+
+        if (hprog < 0 || vprog < 0) {
+                gk20a_warn(&g->dev->dev, "cde: could not determine programs");
+                return -ENOSYS;
         }
 
         if (xtiles > 8192 / 8 || ytiles > 8192 / 8)
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 25712a64..5caef6fe 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -432,6 +432,11 @@ struct gpu_ops {
                 void (*show_dump)(struct gk20a *g,
                                 struct gk20a_debug_output *o);
         } debug;
+        struct {
+                void (*get_program_numbers)(struct gk20a *g,
+                                            u32 block_height_log2,
+                                            int *hprog, int *vprog);
+        } cde;
 };
 
 struct gk20a {