nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 01:50:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: ce: drop prefence support

Browse Source 
Delete the gk20a_fence_in argument in gk20a_ce_execute_ops. It has never
been used and is in the way of some upcoming code cleanup.

NVGPU-43

Change-Id: Ie61e1a2f4945b1e34d64880044c265d26fa822d7
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1646036
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Konsta Holtta
2018-01-05 16:11:14 +02:00
committed by mobile promotions
parent 66c5507daf
commit 91114cd6d4
4 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/nvgpu/common/linux/ce2.c
View File

@@ -43,7 +43,6 @@ int gk20a_ce_execute_ops(struct gk20a *g,
unsigned int payload, unsigned int payload,
int launch_flags, int launch_flags,
int request_operation, int request_operation,
struct gk20a_fence *gk20a_fence_in,
u32 submit_flags, u32 submit_flags,
struct gk20a_fence **gk20a_fence_out) struct gk20a_fence **gk20a_fence_out)
{ {
@@ -135,19 +134,9 @@ int gk20a_ce_execute_ops(struct gk20a *g,
payload, payload,
gk20a_get_valid_launch_flags(g, launch_flags), gk20a_get_valid_launch_flags(g, launch_flags),
request_operation, request_operation,
dma_copy_class, dma_copy_class);
gk20a_fence_in);
if (methodSize) { if (methodSize) {
/* TODO: Remove CPU pre-fence wait */
if (gk20a_fence_in) {
ret = gk20a_fence_wait(g, gk20a_fence_in,
gk20a_get_gr_idle_timeout(g));
gk20a_fence_put(gk20a_fence_in);
if (ret)
goto noop;
}
/* store the element into gpfifo */ /* store the element into gpfifo */
gpfifo.entry0 = gpfifo.entry0 =
u64_lo32(cmd_buf_gpu_va); u64_lo32(cmd_buf_gpu_va);

3
drivers/gpu/nvgpu/common/mm/vidmem.c
View File

@@ -97,7 +97,6 @@ static int __nvgpu_vidmem_do_clear_all(struct gk20a *g)
0x00000000, 0x00000000,
NVGPU_CE_DST_LOCATION_LOCAL_FB, NVGPU_CE_DST_LOCATION_LOCAL_FB,
NVGPU_CE_MEMSET, NVGPU_CE_MEMSET,
NULL,
0, 0,
NULL); NULL);
if (err) { if (err) {
@@ -116,7 +115,6 @@ static int __nvgpu_vidmem_do_clear_all(struct gk20a *g)
0x00000000, 0x00000000,
NVGPU_CE_DST_LOCATION_LOCAL_FB, NVGPU_CE_DST_LOCATION_LOCAL_FB,
NVGPU_CE_MEMSET, NVGPU_CE_MEMSET,
NULL,
0, 0,
&gk20a_fence_out); &gk20a_fence_out);
if (err) { if (err) {
@@ -437,7 +435,6 @@ int nvgpu_vidmem_clear(struct gk20a *g, struct nvgpu_mem *mem)
0x00000000, 0x00000000,
NVGPU_CE_DST_LOCATION_LOCAL_FB, NVGPU_CE_DST_LOCATION_LOCAL_FB,
NVGPU_CE_MEMSET, NVGPU_CE_MEMSET,
NULL,
0, 0,
&gk20a_fence_out); &gk20a_fence_out);

3
drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
View File

@@ -208,8 +208,7 @@ int gk20a_ce_prepare_submit(u64 src_buf,
unsigned int payload, unsigned int payload,
int launch_flags, int launch_flags,
int request_operation, int request_operation,
u32 dma_copy_class, u32 dma_copy_class)
struct gk20a_fence *gk20a_fence_in)
{ {
u32 launch = 0; u32 launch = 0;
u32 methodSize = 0; u32 methodSize = 0;

4
drivers/gpu/nvgpu/gk20a/ce2_gk20a.h
View File

@@ -138,7 +138,6 @@ int gk20a_ce_execute_ops(struct gk20a *g,
unsigned int payload, unsigned int payload,
int launch_flags, int launch_flags,
int request_operation, int request_operation,
struct gk20a_fence *gk20a_fence_in,
u32 submit_flags, u32 submit_flags,
struct gk20a_fence **gk20a_fence_out); struct gk20a_fence **gk20a_fence_out);
void gk20a_ce_delete_context_priv(struct gk20a *g, void gk20a_ce_delete_context_priv(struct gk20a *g,
@@ -153,7 +152,6 @@ int gk20a_ce_prepare_submit(u64 src_buf,
unsigned int payload, unsigned int payload,
int launch_flags, int launch_flags,
int request_operation, int request_operation,
u32 dma_copy_class, u32 dma_copy_class);
struct gk20a_fence *gk20a_fence_in);
#endif /*__CE2_GK20A_H__*/ #endif /*__CE2_GK20A_H__*/