diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | 84 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 33 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 2 |
3 files changed, 119 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c index d15386d7..1a219d2e 100644 --- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/cdev.h> | 21 | #include <linux/cdev.h> |
22 | #include <linux/uaccess.h> | 22 | #include <linux/uaccess.h> |
23 | #include <linux/nvhost.h> | 23 | #include <linux/nvhost.h> |
24 | #include <linux/dma-buf.h> | ||
24 | #include <uapi/linux/nvgpu.h> | 25 | #include <uapi/linux/nvgpu.h> |
25 | 26 | ||
26 | #include "gk20a.h" | 27 | #include "gk20a.h" |
@@ -789,6 +790,84 @@ nvgpu_dbg_gpu_ioctl_suspend_resume_contexts(struct dbg_session_gk20a *dbg_s, | |||
789 | return err; | 790 | return err; |
790 | } | 791 | } |
791 | 792 | ||
793 | static int nvgpu_dbg_gpu_ioctl_access_fb_memory(struct dbg_session_gk20a *dbg_s, | ||
794 | struct nvgpu_dbg_gpu_access_fb_memory_args *args) | ||
795 | { | ||
796 | struct gk20a *g = dbg_s->g; | ||
797 | struct dma_buf *dmabuf; | ||
798 | void __user *user_buffer = (void __user *)(uintptr_t)args->buffer; | ||
799 | void *buffer; | ||
800 | u64 size, access_size, offset; | ||
801 | u64 access_limit_size = SZ_4K; | ||
802 | int err = 0; | ||
803 | |||
804 | if ((args->offset & 3) || (!args->size) || (args->size & 3)) | ||
805 | return -EINVAL; | ||
806 | |||
807 | dmabuf = dma_buf_get(args->dmabuf_fd); | ||
808 | if (IS_ERR(dmabuf)) | ||
809 | return -EINVAL; | ||
810 | |||
811 | if ((args->offset > dmabuf->size) || | ||
812 | (args->size > dmabuf->size) || | ||
813 | (args->offset + args->size > dmabuf->size)) { | ||
814 | err = -EINVAL; | ||
815 | goto fail_dmabuf_put; | ||
816 | } | ||
817 | |||
818 | buffer = nvgpu_alloc(access_limit_size, true); | ||
819 | if (!buffer) { | ||
820 | err = -ENOMEM; | ||
821 | goto fail_dmabuf_put; | ||
822 | } | ||
823 | |||
824 | size = args->size; | ||
825 | offset = 0; | ||
826 | |||
827 | err = gk20a_busy(g->dev); | ||
828 | if (err) | ||
829 | goto fail_free_buffer; | ||
830 | |||
831 | while (size) { | ||
832 | /* Max access size of access_limit_size in one loop */ | ||
833 | access_size = min(access_limit_size, size); | ||
834 | |||
835 | if (args->cmd == | ||
836 | NVGPU_DBG_GPU_IOCTL_ACCESS_FB_MEMORY_CMD_WRITE) { | ||
837 | err = copy_from_user(buffer, user_buffer + offset, | ||
838 | access_size); | ||
839 | if (err) | ||
840 | goto fail_idle; | ||
841 | } | ||
842 | |||
843 | err = gk20a_vidbuf_access_memory(g, dmabuf, buffer, | ||
844 | args->offset + offset, access_size, | ||
845 | args->cmd); | ||
846 | if (err) | ||
847 | goto fail_idle; | ||
848 | |||
849 | if (args->cmd == | ||
850 | NVGPU_DBG_GPU_IOCTL_ACCESS_FB_MEMORY_CMD_READ) { | ||
851 | err = copy_to_user(user_buffer + offset, | ||
852 | buffer, access_size); | ||
853 | if (err) | ||
854 | goto fail_idle; | ||
855 | } | ||
856 | |||
857 | size -= access_size; | ||
858 | offset += access_size; | ||
859 | } | ||
860 | |||
861 | fail_idle: | ||
862 | gk20a_idle(g->dev); | ||
863 | fail_free_buffer: | ||
864 | nvgpu_free(buffer); | ||
865 | fail_dmabuf_put: | ||
866 | dma_buf_put(dmabuf); | ||
867 | |||
868 | return err; | ||
869 | } | ||
870 | |||
792 | long gk20a_dbg_gpu_dev_ioctl(struct file *filp, unsigned int cmd, | 871 | long gk20a_dbg_gpu_dev_ioctl(struct file *filp, unsigned int cmd, |
793 | unsigned long arg) | 872 | unsigned long arg) |
794 | { | 873 | { |
@@ -911,6 +990,11 @@ long gk20a_dbg_gpu_dev_ioctl(struct file *filp, unsigned int cmd, | |||
911 | (struct nvgpu_dbg_gpu_suspend_resume_contexts_args *)buf); | 990 | (struct nvgpu_dbg_gpu_suspend_resume_contexts_args *)buf); |
912 | break; | 991 | break; |
913 | 992 | ||
993 | case NVGPU_DBG_GPU_IOCTL_ACCESS_FB_MEMORY: | ||
994 | err = nvgpu_dbg_gpu_ioctl_access_fb_memory(dbg_s, | ||
995 | (struct nvgpu_dbg_gpu_access_fb_memory_args *)buf); | ||
996 | break; | ||
997 | |||
914 | default: | 998 | default: |
915 | gk20a_err(dev_from_gk20a(g), | 999 | gk20a_err(dev_from_gk20a(g), |
916 | "unrecognized dbg gpu ioctl cmd: 0x%x", | 1000 | "unrecognized dbg gpu ioctl cmd: 0x%x", |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 5faff04b..dcc16fba 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -2301,6 +2301,39 @@ int gk20a_vidmem_get_space(struct gk20a *g, u64 *space) | |||
2301 | #endif | 2301 | #endif |
2302 | } | 2302 | } |
2303 | 2303 | ||
2304 | int gk20a_vidbuf_access_memory(struct gk20a *g, struct dma_buf *dmabuf, | ||
2305 | void *buffer, u64 offset, u64 size, u32 cmd) | ||
2306 | { | ||
2307 | #if defined(CONFIG_GK20A_VIDMEM) | ||
2308 | struct gk20a_vidmem_buf *vidmem_buf; | ||
2309 | struct mem_desc *mem; | ||
2310 | int err = 0; | ||
2311 | |||
2312 | if (gk20a_dmabuf_aperture(g, dmabuf) != APERTURE_VIDMEM) | ||
2313 | return -EINVAL; | ||
2314 | |||
2315 | vidmem_buf = dmabuf->priv; | ||
2316 | mem = vidmem_buf->mem; | ||
2317 | |||
2318 | switch (cmd) { | ||
2319 | case NVGPU_DBG_GPU_IOCTL_ACCESS_FB_MEMORY_CMD_READ: | ||
2320 | gk20a_mem_rd_n(g, mem, offset, buffer, size); | ||
2321 | break; | ||
2322 | |||
2323 | case NVGPU_DBG_GPU_IOCTL_ACCESS_FB_MEMORY_CMD_WRITE: | ||
2324 | gk20a_mem_wr_n(g, mem, offset, buffer, size); | ||
2325 | break; | ||
2326 | |||
2327 | default: | ||
2328 | err = -EINVAL; | ||
2329 | } | ||
2330 | |||
2331 | return err; | ||
2332 | #else | ||
2333 | return -ENOSYS; | ||
2334 | #endif | ||
2335 | } | ||
2336 | |||
2304 | static u64 gk20a_mm_get_align(struct gk20a *g, struct scatterlist *sgl, | 2337 | static u64 gk20a_mm_get_align(struct gk20a *g, struct scatterlist *sgl, |
2305 | enum gk20a_aperture aperture) | 2338 | enum gk20a_aperture aperture) |
2306 | { | 2339 | { |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h index 512d32e9..36ba6248 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h | |||
@@ -762,6 +762,8 @@ void gk20a_vm_mapping_batch_finish_locked( | |||
762 | 762 | ||
763 | int gk20a_vidmem_buf_alloc(struct gk20a *g, size_t bytes); | 763 | int gk20a_vidmem_buf_alloc(struct gk20a *g, size_t bytes); |
764 | int gk20a_vidmem_get_space(struct gk20a *g, u64 *space); | 764 | int gk20a_vidmem_get_space(struct gk20a *g, u64 *space); |
765 | int gk20a_vidbuf_access_memory(struct gk20a *g, struct dma_buf *dmabuf, | ||
766 | void *buffer, u64 offset, u64 size, u32 cmd); | ||
765 | 767 | ||
766 | /* Note: batch may be NULL if map op is not part of a batch */ | 768 | /* Note: batch may be NULL if map op is not part of a batch */ |
767 | int gk20a_vm_map_buffer(struct vm_gk20a *vm, | 769 | int gk20a_vm_map_buffer(struct vm_gk20a *vm, |