diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2018-08-27 07:28:43 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-31 00:42:48 -0400 |
commit | 5a140928c2397be4780367d2a3b11de2c5d17446 (patch) | |
tree | d54d7815c9fadca695b529a8043efdfbc71d95ce /drivers | |
parent | 5e90bf3f6c35361cacc1ce8588c3120091d54f58 (diff) |
gpu: nvgpu: move gpfifo_desc to channel header
struct gpfifo_desc belongs to channel; reduce dependencies to mm by
moving it there.
Jira NVGPU-967
Change-Id: I3c6ac3d4e47fc0c843d407ee0e1100a009763d08
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1807398
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 14 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h index 2a1fd03f..0ef63d18 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |||
@@ -77,6 +77,20 @@ struct nvgpu_gpfifo_entry { | |||
77 | u32 entry1; | 77 | u32 entry1; |
78 | }; | 78 | }; |
79 | 79 | ||
80 | struct gpfifo_desc { | ||
81 | struct nvgpu_mem mem; | ||
82 | u32 entry_num; | ||
83 | |||
84 | u32 get; | ||
85 | u32 put; | ||
86 | |||
87 | bool wrap; | ||
88 | |||
89 | /* if gpfifo lives in vidmem or is forced to go via PRAMIN, first copy | ||
90 | * from userspace to pipe and then from pipe to gpu buffer */ | ||
91 | void *pipe; | ||
92 | }; | ||
93 | |||
80 | struct nvgpu_gpfifo_args { | 94 | struct nvgpu_gpfifo_args { |
81 | u32 num_entries; | 95 | u32 num_entries; |
82 | u32 num_inflight_jobs; | 96 | u32 num_inflight_jobs; |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h index 0827d355..708dada3 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h | |||
@@ -32,20 +32,6 @@ | |||
32 | 32 | ||
33 | enum gk20a_mem_rw_flag; | 33 | enum gk20a_mem_rw_flag; |
34 | 34 | ||
35 | struct gpfifo_desc { | ||
36 | struct nvgpu_mem mem; | ||
37 | u32 entry_num; | ||
38 | |||
39 | u32 get; | ||
40 | u32 put; | ||
41 | |||
42 | bool wrap; | ||
43 | |||
44 | /* if gpfifo lives in vidmem or is forced to go via PRAMIN, first copy | ||
45 | * from userspace to pipe and then from pipe to gpu buffer */ | ||
46 | void *pipe; | ||
47 | }; | ||
48 | |||
49 | struct patch_desc { | 35 | struct patch_desc { |
50 | struct nvgpu_mem mem; | 36 | struct nvgpu_mem mem; |
51 | u32 data_count; | 37 | u32 data_count; |