diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-05-07 06:09:36 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:09:20 -0400 |
commit | 4ac110cb8a46a0c91a4a1e39c168de1b49688971 (patch) | |
tree | 5cf832c256e8e7b4c28c2a08ed28614d44c00ea4 /drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |
parent | 4d93f777450e5bf46d5001426b3a437810cd852b (diff) |
gpu: nvgpu: Register as subdomain of host1x
Add gk20a as a sub power domain of host1x. This enforces keeping
host1x on when using gk20a.
Bug 200003112
Change-Id: I08db595bc7b819d86d33fb98af0d8fb4de369463
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-on: http://git-master/r/407543
Reviewed-by: Riham Haidar <rhaidar@nvidia.com>
Tested-by: Riham Haidar <rhaidar@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/platform_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index 09f348cb..90333eef 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |||
@@ -71,17 +71,6 @@ struct gk20a_platform { | |||
71 | */ | 71 | */ |
72 | int (*late_probe)(struct platform_device *dev); | 72 | int (*late_probe)(struct platform_device *dev); |
73 | 73 | ||
74 | /* Called before submitting work to the gpu. The platform may use this | ||
75 | * hook to ensure that any other hw modules that the gpu depends on are | ||
76 | * powered. The platform implementation must count refs to this call. */ | ||
77 | int (*channel_busy)(struct platform_device *dev); | ||
78 | |||
79 | /* Called after the work on the gpu is completed. The platform may use | ||
80 | * this hook to release power refs to any other hw modules that the gpu | ||
81 | * depends on. The platform implementation must count refs to this | ||
82 | * call. */ | ||
83 | void (*channel_idle)(struct platform_device *dev); | ||
84 | |||
85 | /* This function is called to allocate secure memory (memory that the | 74 | /* This function is called to allocate secure memory (memory that the |
86 | * CPU cannot see). The function should fill the context buffer | 75 | * CPU cannot see). The function should fill the context buffer |
87 | * descriptor (especially fields destroy, sgt, size). | 76 | * descriptor (especially fields destroy, sgt, size). |
@@ -134,23 +123,6 @@ extern struct gk20a_platform gk20a_generic_platform; | |||
134 | extern struct gk20a_platform gk20a_tegra_platform; | 123 | extern struct gk20a_platform gk20a_tegra_platform; |
135 | #endif | 124 | #endif |
136 | 125 | ||
137 | static inline int gk20a_platform_channel_busy(struct platform_device *dev) | ||
138 | { | ||
139 | struct gk20a_platform *p = gk20a_get_platform(dev); | ||
140 | int ret = 0; | ||
141 | if (p->channel_busy) | ||
142 | ret = p->channel_busy(dev); | ||
143 | |||
144 | return ret; | ||
145 | } | ||
146 | |||
147 | static inline void gk20a_platform_channel_idle(struct platform_device *dev) | ||
148 | { | ||
149 | struct gk20a_platform *p = gk20a_get_platform(dev); | ||
150 | if (p->channel_idle) | ||
151 | p->channel_idle(dev); | ||
152 | } | ||
153 | |||
154 | static inline bool gk20a_platform_has_syncpoints(struct platform_device *dev) | 126 | static inline bool gk20a_platform_has_syncpoints(struct platform_device *dev) |
155 | { | 127 | { |
156 | struct gk20a_platform *p = gk20a_get_platform(dev); | 128 | struct gk20a_platform *p = gk20a_get_platform(dev); |