gpu: nvgpu: fix tsg bugs

- correct runlist entry type for tsg
- consider tsg when preempt channel

Bug 1617046

Change-Id: Ie067df17fb53ae91c49403637a5f35fc3710e0b3
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/926571
GVS: Gerrit_Virtual_Submit
Reviewed-by: Aingara Paramakuru <aparamakuru@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 9 insertions, 17 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index ce91fd49..6b5807aa 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -2138,26 +2138,18 @@ static int gk20a_fifo_runlist_wait_pending(struct gk20a *g, u32 runlist_id)
 
 static inline u32 gk20a_get_tsg_runlist_entry_0(struct tsg_gk20a *tsg)
 {
-        u32 runlist_entry_0 = 0;
+        u32 runlist_entry_0 = ram_rl_entry_id_f(tsg->tsgid) |
+                        ram_rl_entry_type_tsg_f() |
+                        ram_rl_entry_tsg_length_f(tsg->num_active_channels);
 
         if (tsg->timeslice_timeout)
-                runlist_entry_0 = ram_rl_entry_id_f(tsg->tsgid) |
-                        ram_rl_entry_type_f(ram_rl_entry_type_tsg_f()) |
-                        ram_rl_entry_timeslice_scale_f(
-                                tsg->timeslice_scale) |
-                        ram_rl_entry_timeslice_timeout_f(
-                                tsg->timeslice_timeout) |
-                        ram_rl_entry_tsg_length_f(
-                                tsg->num_active_channels);
+                runlist_entry_0 |=
+                        ram_rl_entry_timeslice_scale_f(tsg->timeslice_scale) |
+                        ram_rl_entry_timeslice_timeout_f(tsg->timeslice_timeout);
         else
-                runlist_entry_0 = ram_rl_entry_id_f(tsg->tsgid) |
-                        ram_rl_entry_type_f(ram_rl_entry_type_tsg_f()) |
-                        ram_rl_entry_timeslice_scale_f(
-                                ram_rl_entry_timeslice_scale_3_f()) |
-                        ram_rl_entry_timeslice_timeout_f(
-                               ram_rl_entry_timeslice_timeout_128_f()) |
-                        ram_rl_entry_tsg_length_f(
-                                tsg->num_active_channels);
+                runlist_entry_0 |=
+                        ram_rl_entry_timeslice_scale_3_f() |
+                        ram_rl_entry_timeslice_timeout_128_f();
 
         return runlist_entry_0;
 }