From 6ea52c59b0262556edb01835eaf91b3bfcdcdd71 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 15 Jun 2018 09:25:01 -0700 Subject: gpu: nvgpu: Implement common nvgpu_mem_rd* functions nvgpu_mem_rd*() functions were implemented per OS. They also used nvgpu_pramin_access_batched() and implemented a big portion of logic for using PRAMIN in OS specific code. Make the implementation for the functions generic. Move all PRAMIN logic to PRAMIN and simplify the interface provided by PRAMIN. Change-Id: I1acb9e8d7d424325dc73314d5738cb2c9ebf7692 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1753708 Reviewed-by: Konsta Holtta GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/io.h | 1 + drivers/gpu/nvgpu/include/nvgpu/pramin.h | 12 +++--------- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/include') diff --git a/drivers/gpu/nvgpu/include/nvgpu/io.h b/drivers/gpu/nvgpu/include/nvgpu/io.h index 28011e04..8504829c 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/io.h +++ b/drivers/gpu/nvgpu/include/nvgpu/io.h @@ -36,6 +36,7 @@ struct gk20a; void nvgpu_writel(struct gk20a *g, u32 r, u32 v); +void nvgpu_writel_relaxed(struct gk20a *g, u32 r, u32 v); u32 nvgpu_readl(struct gk20a *g, u32 r); u32 __nvgpu_readl(struct gk20a *g, u32 r); void nvgpu_writel_check(struct gk20a *g, u32 r, u32 v); diff --git a/drivers/gpu/nvgpu/include/nvgpu/pramin.h b/drivers/gpu/nvgpu/include/nvgpu/pramin.h index 33702bc8..c9f54a6f 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/pramin.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pramin.h @@ -29,16 +29,10 @@ struct gk20a; struct mm_gk20a; struct nvgpu_mem; -/* - * This typedef is for functions that get called during the access_batched() - * operation. - */ -typedef void (*pramin_access_batch_fn)(struct gk20a *g, u32 start, u32 words, - u32 **arg); -void nvgpu_pramin_access_batched(struct gk20a *g, struct nvgpu_mem *mem, - u32 offset, u32 size, - pramin_access_batch_fn loop, u32 **arg); +void nvgpu_pramin_rd_n(struct gk20a *g, struct nvgpu_mem *mem, u32 start, u32 words, void *dest); +void nvgpu_pramin_wr_n(struct gk20a *g, struct nvgpu_mem *mem, u32 start, u32 words, void *src); +void nvgpu_pramin_memset(struct gk20a *g, struct nvgpu_mem *mem, u32 start, u32 words, u32 w); void nvgpu_init_pramin(struct mm_gk20a *mm); -- cgit v1.2.2