diff options
author | Richard Zhao <rizhao@nvidia.com> | 2016-06-02 20:17:14 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-06-16 17:06:46 -0400 |
commit | 86225cb04eb040a83400d5ad6619b3c2318a53f8 (patch) | |
tree | 3c61b7b6831ee2f01c9977d77b3ac9bbaf0f3407 /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | 03164b0f4abeb06d4b5207531b97f11fe4a860dd (diff) |
gpu: nvgpu: add read_ptimer to gops
Move all places that read ptimer to use the callback.
It's for add vgpu implementation of read ptimer.
Bug 1395833
Change-Id: Ia339f2f08d75ca4969a443fffc9a61cff1d3d2b7
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/1159587
(cherry picked from commit a01f804684f875c9cffc31eb2c1038f2f29ec66f)
Reviewed-on: http://git-master/r/1158449
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 4ede8982..e639ace4 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -620,6 +620,7 @@ struct gpu_ops { | |||
620 | 620 | ||
621 | int (*get_litter_value)(struct gk20a *g, enum nvgpu_litter_value value); | 621 | int (*get_litter_value)(struct gk20a *g, enum nvgpu_litter_value value); |
622 | int (*chip_init_gpu_characteristics)(struct gk20a *g); | 622 | int (*chip_init_gpu_characteristics)(struct gk20a *g); |
623 | int (*read_ptimer)(struct gk20a *g, u64 *value); | ||
623 | 624 | ||
624 | struct { | 625 | struct { |
625 | int (*init)(struct gk20a *g); | 626 | int (*init)(struct gk20a *g); |
@@ -1111,7 +1112,7 @@ static inline u32 scale_ptimer(u32 timeout , u32 scale10x) | |||
1111 | return (timeout * 10) / scale10x; | 1112 | return (timeout * 10) / scale10x; |
1112 | } | 1113 | } |
1113 | 1114 | ||
1114 | u64 gk20a_read_ptimer(struct gk20a *g); | 1115 | int gk20a_read_ptimer(struct gk20a *g, u64 *value); |
1115 | extern struct class nvgpu_class; | 1116 | extern struct class nvgpu_class; |
1116 | 1117 | ||
1117 | #define INTERFACE_NAME "nvhost%s-gpu" | 1118 | #define INTERFACE_NAME "nvhost%s-gpu" |