diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2016-09-20 06:34:52 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-10-14 11:12:34 -0400 |
commit | fa6ab1943e2977c64f62ba5b9c05b6d7fba234f3 (patch) | |
tree | 6fd04ad08ee38c0cc66ed34e12e21a9ac07e41c9 /drivers/gpu | |
parent | 4d07572c8279f199c220e7c606cc9ffb73216d83 (diff) |
gpu: nvgpu: add ioctl for querying memory state
Add NVGPU_GPU_IOCTL_GET_MEMORY_STATE to read the amount of free
device-local video memory, if applicable.
Some reserved fields are added to support different types of queries in
the future (e.g. context-local free amount).
Bug 1787771
Bug 200233138
Change-Id: Id5ffd02ad4d6ed3a6dc196541938573c27b340ac
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1223762
(cherry picked from commit 96221d96c7972c6387944603e974f7639d6dbe70)
Reviewed-on: http://git-master/r/1235980
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | 23 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 20 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 1 |
3 files changed, 44 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c index 6b832670..2fdf719a 100644 --- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | |||
@@ -747,6 +747,24 @@ static int nvgpu_gpu_alloc_vidmem(struct gk20a *g, | |||
747 | return 0; | 747 | return 0; |
748 | } | 748 | } |
749 | 749 | ||
750 | static int nvgpu_gpu_get_memory_state(struct gk20a *g, | ||
751 | struct nvgpu_gpu_get_memory_state_args *args) | ||
752 | { | ||
753 | int err; | ||
754 | |||
755 | gk20a_dbg_fn(""); | ||
756 | |||
757 | if (args->reserved[0] || args->reserved[1] || | ||
758 | args->reserved[2] || args->reserved[3]) | ||
759 | return -EINVAL; | ||
760 | |||
761 | err = gk20a_vidmem_get_space(g, &args->total_free_bytes); | ||
762 | |||
763 | gk20a_dbg_fn("done, err=%d, bytes=%lld", err, args->total_free_bytes); | ||
764 | |||
765 | return err; | ||
766 | } | ||
767 | |||
750 | long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | 768 | long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) |
751 | { | 769 | { |
752 | struct device *dev = filp->private_data; | 770 | struct device *dev = filp->private_data; |
@@ -999,6 +1017,11 @@ long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg | |||
999 | (struct nvgpu_gpu_alloc_vidmem_args *)buf); | 1017 | (struct nvgpu_gpu_alloc_vidmem_args *)buf); |
1000 | break; | 1018 | break; |
1001 | 1019 | ||
1020 | case NVGPU_GPU_IOCTL_GET_MEMORY_STATE: | ||
1021 | err = nvgpu_gpu_get_memory_state(g, | ||
1022 | (struct nvgpu_gpu_get_memory_state_args *)buf); | ||
1023 | break; | ||
1024 | |||
1002 | default: | 1025 | default: |
1003 | dev_dbg(dev_from_gk20a(g), "unrecognized gpu ioctl cmd: 0x%x", cmd); | 1026 | dev_dbg(dev_from_gk20a(g), "unrecognized gpu ioctl cmd: 0x%x", cmd); |
1004 | err = -ENOTTY; | 1027 | err = -ENOTTY; |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index f46f7a81..ff9bb5e2 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -2276,6 +2276,26 @@ err_kfree: | |||
2276 | #endif | 2276 | #endif |
2277 | } | 2277 | } |
2278 | 2278 | ||
2279 | int gk20a_vidmem_get_space(struct gk20a *g, u64 *space) | ||
2280 | { | ||
2281 | #if defined(CONFIG_GK20A_VIDMEM) | ||
2282 | struct gk20a_allocator *allocator = &g->mm.vidmem.allocator; | ||
2283 | |||
2284 | gk20a_dbg_fn(""); | ||
2285 | |||
2286 | if (!gk20a_alloc_initialized(allocator)) | ||
2287 | return -ENOSYS; | ||
2288 | |||
2289 | mutex_lock(&g->mm.vidmem.clear_list_mutex); | ||
2290 | *space = gk20a_alloc_space(allocator) + | ||
2291 | atomic64_read(&g->mm.vidmem.bytes_pending); | ||
2292 | mutex_unlock(&g->mm.vidmem.clear_list_mutex); | ||
2293 | return 0; | ||
2294 | #else | ||
2295 | return -ENOSYS; | ||
2296 | #endif | ||
2297 | } | ||
2298 | |||
2279 | static u64 gk20a_mm_get_align(struct gk20a *g, struct scatterlist *sgl, | 2299 | static u64 gk20a_mm_get_align(struct gk20a *g, struct scatterlist *sgl, |
2280 | enum gk20a_aperture aperture) | 2300 | enum gk20a_aperture aperture) |
2281 | { | 2301 | { |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h index b25a7789..e8f7da98 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h | |||
@@ -755,6 +755,7 @@ void gk20a_vm_mapping_batch_finish_locked( | |||
755 | 755 | ||
756 | 756 | ||
757 | int gk20a_vidmem_buf_alloc(struct gk20a *g, size_t bytes); | 757 | int gk20a_vidmem_buf_alloc(struct gk20a *g, size_t bytes); |
758 | int gk20a_vidmem_get_space(struct gk20a *g, u64 *space); | ||
758 | 759 | ||
759 | /* Note: batch may be NULL if map op is not part of a batch */ | 760 | /* Note: batch may be NULL if map op is not part of a batch */ |
760 | int gk20a_vm_map_buffer(struct vm_gk20a *vm, | 761 | int gk20a_vm_map_buffer(struct vm_gk20a *vm, |