Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1193c3bc authored by Rob Clark's avatar Rob Clark
Browse files

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: default avatarRob Clark <robdclark@gmail.com>
parent ed19075b

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+1 −3
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ void adreno_recover(struct msm_gpu *gpu) 
	}

}



int adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,

void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,

		struct msm_file_private *ctx)

{

	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, 
#endif



	gpu->funcs->flush(gpu);



	return 0;

}



void adreno_flush(struct msm_gpu *gpu)

drivers/gpu/drm/msm/adreno/adreno_gpu.h

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value); 
int adreno_hw_init(struct msm_gpu *gpu);

uint32_t adreno_last_fence(struct msm_gpu *gpu);

void adreno_recover(struct msm_gpu *gpu);

int adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,

void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,

		struct msm_file_private *ctx);

void adreno_flush(struct msm_gpu *gpu);

void adreno_idle(struct msm_gpu *gpu);

drivers/gpu/drm/msm/msm_gpu.c

+2 −2
Original line number Diff line number Diff line
@@ -540,12 +540,12 @@ int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 
			msm_gem_move_to_active(&msm_obj->base, gpu, false, submit->fence);

	}



	ret = gpu->funcs->submit(gpu, submit, ctx);

	gpu->funcs->submit(gpu, submit, ctx);

	priv->lastctx = ctx;



	hangcheck_timer_reset(gpu);



	return ret;

	return 0;

}



/*

drivers/gpu/drm/msm/msm_gpu.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ struct msm_gpu_funcs { 
	int (*hw_init)(struct msm_gpu *gpu);

	int (*pm_suspend)(struct msm_gpu *gpu);

	int (*pm_resume)(struct msm_gpu *gpu);

	int (*submit)(struct msm_gpu *gpu, struct msm_gem_submit *submit,

	void (*submit)(struct msm_gpu *gpu, struct msm_gem_submit *submit,

			struct msm_file_private *ctx);

	void (*flush)(struct msm_gpu *gpu);

	void (*idle)(struct msm_gpu *gpu);