summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.h
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2014-06-18 07:22:44 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:10:17 -0400
commitd46c8e40035f65194baceeb4210a395c8087940a (patch)
tree123ff729b9747514d367f5b9604fc44a127380a7 /drivers/gpu/nvgpu/gk20a/gk20a.h
parentee66559a0b3b82b3dc9be684261ddd0954731ff5 (diff)
gpu: nvgpu: Remove extra g field in pmu_gk20a
pmu_gk20a has a pointer to struct gk20a *. As pmu_gk20a is part of gk20a, there's no need to have the circular dependency. Bug 200006956 Change-Id: I6d5d10a93b2fba4a26a1e28b3c5206506dc6cc04 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/424767
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 60b9b80e..127cb85c 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -522,6 +522,11 @@ static inline struct gk20a *gk20a_from_as(struct gk20a_as *as)
522{ 522{
523 return container_of(as, struct gk20a, as); 523 return container_of(as, struct gk20a, as);
524} 524}
525static inline struct gk20a *gk20a_from_pmu(struct pmu_gk20a *pmu)
526{
527 return container_of(pmu, struct gk20a, pmu);
528}
529
525static inline u32 u64_hi32(u64 n) 530static inline u32 u64_hi32(u64 n)
526{ 531{
527 return (u32)((n >> 32) & ~(u32)0); 532 return (u32)((n >> 32) & ~(u32)0);