diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-03-17 08:51:55 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:08:54 -0400 |
commit | 4a8f0db37976036abfe4d70ff60cd0991a177a7d (patch) | |
tree | 5c633c963f3d278b8b15e478f751125c867abc93 /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | b5acc421ee159c932e9e95adaa6d89a0c2141b38 (diff) |
gpu: nvgpu: gk20a: Fix G_ELPG flush poll
We poll completion of flush sequence by polling the broadcast
register. The polling should be done for a per-slice register
instead.
Bug 1457723
Change-Id: I10aba939175b6d05b05f5f26eebebcbe09d9b4a7
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/382521
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Tested-by: Juha Tukkinen <jtukkinen@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index c19b2bf8..3bc53992 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -73,6 +73,7 @@ struct gpu_ops { | |||
73 | int (*init_zbc)(struct gk20a *g, struct gr_gk20a *gr); | 73 | int (*init_zbc)(struct gk20a *g, struct gr_gk20a *gr); |
74 | void (*init_cbc)(struct gk20a *g, struct gr_gk20a *gr); | 74 | void (*init_cbc)(struct gk20a *g, struct gr_gk20a *gr); |
75 | void (*sync_debugfs)(struct gk20a *g); | 75 | void (*sync_debugfs)(struct gk20a *g); |
76 | void (*init_fs_state)(struct gk20a *g); | ||
76 | void (*elpg_flush)(struct gk20a *g); | 77 | void (*elpg_flush)(struct gk20a *g); |
77 | } ltc; | 78 | } ltc; |
78 | struct { | 79 | struct { |
@@ -287,6 +288,8 @@ struct gk20a { | |||
287 | 288 | ||
288 | int irq_stall; | 289 | int irq_stall; |
289 | int irq_nonstall; | 290 | int irq_nonstall; |
291 | u32 max_ltc_count; | ||
292 | u32 ltc_count; | ||
290 | 293 | ||
291 | struct generic_pm_domain pd; | 294 | struct generic_pm_domain pd; |
292 | 295 | ||