Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/msm: drop return from gpu->submit()

At this point, there is nothing left to fail. And submit already has a
fence assigned and is added to the submit_list. Any problems from here
on out are asynchronous (ie. hangcheck/recovery).

Signed-off-by: Rob Clark <robdclark@gmail.com>

Rob Clark 1193c3bc ed19075b

+5 -7
+1 -3
drivers/gpu/drm/msm/adreno/adreno_gpu.c
··· 133 133 } 134 134 } 135 135 136 - int adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 136 + void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 137 137 struct msm_file_private *ctx) 138 138 { 139 139 struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); ··· 212 212 #endif 213 213 214 214 gpu->funcs->flush(gpu); 215 - 216 - return 0; 217 215 } 218 216 219 217 void adreno_flush(struct msm_gpu *gpu)
+1 -1
drivers/gpu/drm/msm/adreno/adreno_gpu.h
··· 238 238 int adreno_hw_init(struct msm_gpu *gpu); 239 239 uint32_t adreno_last_fence(struct msm_gpu *gpu); 240 240 void adreno_recover(struct msm_gpu *gpu); 241 - int adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 241 + void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 242 242 struct msm_file_private *ctx); 243 243 void adreno_flush(struct msm_gpu *gpu); 244 244 void adreno_idle(struct msm_gpu *gpu);
+2 -2
drivers/gpu/drm/msm/msm_gpu.c
··· 540 540 msm_gem_move_to_active(&msm_obj->base, gpu, false, submit->fence); 541 541 } 542 542 543 - ret = gpu->funcs->submit(gpu, submit, ctx); 543 + gpu->funcs->submit(gpu, submit, ctx); 544 544 priv->lastctx = ctx; 545 545 546 546 hangcheck_timer_reset(gpu); 547 547 548 - return ret; 548 + return 0; 549 549 } 550 550 551 551 /*
+1 -1
drivers/gpu/drm/msm/msm_gpu.h
··· 47 47 int (*hw_init)(struct msm_gpu *gpu); 48 48 int (*pm_suspend)(struct msm_gpu *gpu); 49 49 int (*pm_resume)(struct msm_gpu *gpu); 50 - int (*submit)(struct msm_gpu *gpu, struct msm_gem_submit *submit, 50 + void (*submit)(struct msm_gpu *gpu, struct msm_gem_submit *submit, 51 51 struct msm_file_private *ctx); 52 52 void (*flush)(struct msm_gpu *gpu); 53 53 void (*idle)(struct msm_gpu *gpu);