diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index a7a08b5a..e65ed278 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -1591,7 +1591,7 @@ static void gk20a_channel_worker_process(struct gk20a *g, int *get) | |||
1591 | static int gk20a_channel_poll_worker(void *arg) | 1591 | static int gk20a_channel_poll_worker(void *arg) |
1592 | { | 1592 | { |
1593 | struct gk20a *g = (struct gk20a *)arg; | 1593 | struct gk20a *g = (struct gk20a *)arg; |
1594 | struct gk20a_channel_worker *worker = &g->channel_worker; | 1594 | struct gk20a_worker *worker = &g->channel_worker; |
1595 | unsigned long watchdog_interval = 100; /* milliseconds */ | 1595 | unsigned long watchdog_interval = 100; /* milliseconds */ |
1596 | struct nvgpu_timeout timeout; | 1596 | struct nvgpu_timeout timeout; |
1597 | int get = 0; | 1597 | int get = 0; |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 75357a82..03cfe285 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1406,14 +1406,14 @@ struct gk20a { | |||
1406 | u32 ltc_count; | 1406 | u32 ltc_count; |
1407 | u32 ltc_streamid; | 1407 | u32 ltc_streamid; |
1408 | 1408 | ||
1409 | struct gk20a_channel_worker { | 1409 | struct gk20a_worker { |
1410 | struct nvgpu_thread poll_task; | 1410 | struct nvgpu_thread poll_task; |
1411 | nvgpu_atomic_t put; | 1411 | nvgpu_atomic_t put; |
1412 | struct nvgpu_cond wq; | 1412 | struct nvgpu_cond wq; |
1413 | struct nvgpu_list_node items; | 1413 | struct nvgpu_list_node items; |
1414 | struct nvgpu_spinlock items_lock; | 1414 | struct nvgpu_spinlock items_lock; |
1415 | struct nvgpu_mutex start_lock; | 1415 | struct nvgpu_mutex start_lock; |
1416 | } channel_worker; | 1416 | } channel_worker, clk_arb_worker; |
1417 | 1417 | ||
1418 | struct { | 1418 | struct { |
1419 | void (*open)(struct channel_gk20a *ch); | 1419 | void (*open)(struct channel_gk20a *ch); |