diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-13 10:56:43 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-18 11:15:11 -0400 |
commit | 67a41e46a230cde7353e4cd46040f1e71d7cd289 (patch) | |
tree | 0697ce5ba224db6a92cdab0b192a8069f669be63 /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | 8f48afe26bc39fd7508646e8c3ea6bfeb665beae (diff) |
gpu: nvgpu: Read all fields of device_info
We were not using the engine_type field in device info, and the code
did not handle chained entries properly. The code assumed that first
entry is for graphics and second for CE, which is not always true.
Improve the code to go through all entries of device_info, and
preserve values across entries until we reach the last entry.
Only last entry triggers a write to fifo engine info.
There can also be multiple engines with same type, so accumulate
interrupts and reset ids from all of them.
As the code got fixed, now it reads the engine enum correctly from
hardware. We used to compare that against CE0, but we should compare
against CE2.
gk20a_fifo_reset_engine() uses wrong constants - it is passed a
internal numbering of engines, but it compares them against hardware
engine enum.
Change-Id: Ia59273921c602d2a090f7a5b1404afb0fca2532c
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1147746
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 5d06a441..d5310b02 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -330,6 +330,7 @@ struct gpu_ops { | |||
330 | int (*channel_set_timeslice)(struct channel_gk20a *ch, | 330 | int (*channel_set_timeslice)(struct channel_gk20a *ch, |
331 | u32 timeslice); | 331 | u32 timeslice); |
332 | int (*force_reset_ch)(struct channel_gk20a *ch, bool verbose); | 332 | int (*force_reset_ch)(struct channel_gk20a *ch, bool verbose); |
333 | int (*engine_enum_from_type)(struct gk20a *g, u32 engine_type); | ||
333 | } fifo; | 334 | } fifo; |
334 | struct pmu_v { | 335 | struct pmu_v { |
335 | /*used for change of enum zbc update cmd id from ver 0 to ver1*/ | 336 | /*used for change of enum zbc update cmd id from ver 0 to ver1*/ |