diff options
author | Rob Clark <robdclark@gmail.com> | 2016-05-03 09:46:49 -0400 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2016-05-08 10:22:18 -0400 |
commit | 1193c3bcb581807d58dd7df90528ec744af387a9 (patch) | |
tree | edab8c9cfd154ffec1f53c3fb664b87692987915 | |
parent | ed19075be1100f8958066ed798e225173583eb2e (diff) |
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>
-rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_gpu.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.h | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 1d5a714d24a6..fbe304ee6c80 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c | |||
@@ -133,7 +133,7 @@ void adreno_recover(struct msm_gpu *gpu) | |||
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 | struct msm_file_private *ctx) | 137 | struct msm_file_private *ctx) |
138 | { | 138 | { |
139 | struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); | 139 | struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); |
@@ -212,8 +212,6 @@ int adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, | |||
212 | #endif | 212 | #endif |
213 | 213 | ||
214 | gpu->funcs->flush(gpu); | 214 | gpu->funcs->flush(gpu); |
215 | |||
216 | return 0; | ||
217 | } | 215 | } |
218 | 216 | ||
219 | void adreno_flush(struct msm_gpu *gpu) | 217 | void adreno_flush(struct msm_gpu *gpu) |
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index 1d07511f4d22..a54f6e036b4a 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h | |||
@@ -238,7 +238,7 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value); | |||
238 | int adreno_hw_init(struct msm_gpu *gpu); | 238 | int adreno_hw_init(struct msm_gpu *gpu); |
239 | uint32_t adreno_last_fence(struct msm_gpu *gpu); | 239 | uint32_t adreno_last_fence(struct msm_gpu *gpu); |
240 | void adreno_recover(struct msm_gpu *gpu); | 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 | struct msm_file_private *ctx); | 242 | struct msm_file_private *ctx); |
243 | void adreno_flush(struct msm_gpu *gpu); | 243 | void adreno_flush(struct msm_gpu *gpu); |
244 | void adreno_idle(struct msm_gpu *gpu); | 244 | void adreno_idle(struct msm_gpu *gpu); |
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index f94d01099e19..4c4f4b5abe2c 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c | |||
@@ -540,12 +540,12 @@ int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, | |||
540 | msm_gem_move_to_active(&msm_obj->base, gpu, false, submit->fence); | 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 | priv->lastctx = ctx; | 544 | priv->lastctx = ctx; |
545 | 545 | ||
546 | hangcheck_timer_reset(gpu); | 546 | hangcheck_timer_reset(gpu); |
547 | 547 | ||
548 | return ret; | 548 | return 0; |
549 | } | 549 | } |
550 | 550 | ||
551 | /* | 551 | /* |
diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 025e25b648e7..c9022837a1a4 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h | |||
@@ -47,7 +47,7 @@ struct msm_gpu_funcs { | |||
47 | int (*hw_init)(struct msm_gpu *gpu); | 47 | int (*hw_init)(struct msm_gpu *gpu); |
48 | int (*pm_suspend)(struct msm_gpu *gpu); | 48 | int (*pm_suspend)(struct msm_gpu *gpu); |
49 | int (*pm_resume)(struct msm_gpu *gpu); | 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 | struct msm_file_private *ctx); | 51 | struct msm_file_private *ctx); |
52 | void (*flush)(struct msm_gpu *gpu); | 52 | void (*flush)(struct msm_gpu *gpu); |
53 | void (*idle)(struct msm_gpu *gpu); | 53 | void (*idle)(struct msm_gpu *gpu); |