Commit 15eb9ad0 authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm: Drop context arg to gpu->submit() 



Now that we can get the ctx from the submitqueue, the extra arg is
redundant.

Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
[split out of previous patch to reduce churny noise]
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent cf655d61

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

+5 −7
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ static void a5xx_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring) 
		gpu_write(gpu, REG_A5XX_CP_RB_WPTR, wptr);

}



static void a5xx_submit_in_rb(struct msm_gpu *gpu, struct msm_gem_submit *submit,

	struct msm_file_private *ctx)

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

{

	struct msm_drm_private *priv = gpu->dev->dev_private;

	struct msm_ringbuffer *ring = submit->ring;
@@ -57,7 +56,7 @@ static void a5xx_submit_in_rb(struct msm_gpu *gpu, struct msm_gem_submit *submit 
		case MSM_SUBMIT_CMD_IB_TARGET_BUF:

			break;

		case MSM_SUBMIT_CMD_CTX_RESTORE_BUF:

			if (priv->lastctx == ctx)

			if (priv->lastctx == submit->queue->ctx)

				break;

			/* fall-thru */

		case MSM_SUBMIT_CMD_BUF:
@@ -103,8 +102,7 @@ static void a5xx_submit_in_rb(struct msm_gpu *gpu, struct msm_gem_submit *submit 
	msm_gpu_retire(gpu);

}



static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,

	struct msm_file_private *ctx)

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

{

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

	struct a5xx_gpu *a5xx_gpu = to_a5xx_gpu(adreno_gpu);
@@ -114,7 +112,7 @@ static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 


	if (IS_ENABLED(CONFIG_DRM_MSM_GPU_SUDO) && submit->in_rb) {

		priv->lastctx = NULL;

		a5xx_submit_in_rb(gpu, submit, ctx);

		a5xx_submit_in_rb(gpu, submit);

		return;

	}
@@ -148,7 +146,7 @@ static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 
		case MSM_SUBMIT_CMD_IB_TARGET_BUF:

			break;

		case MSM_SUBMIT_CMD_CTX_RESTORE_BUF:

			if (priv->lastctx == ctx)

			if (priv->lastctx == submit->queue->ctx)

				break;

			/* fall-thru */

		case MSM_SUBMIT_CMD_BUF:

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

+2 −3
Original line number Diff line number Diff line
@@ -81,8 +81,7 @@ static void get_stats_counter(struct msm_ringbuffer *ring, u32 counter, 
	OUT_RING(ring, upper_32_bits(iova));

}



static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,

	struct msm_file_private *ctx)

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

{

	unsigned int index = submit->seqno % MSM_GPU_SUBMIT_STATS_COUNT;

	struct msm_drm_private *priv = gpu->dev->dev_private;
@@ -115,7 +114,7 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 
		case MSM_SUBMIT_CMD_IB_TARGET_BUF:

			break;

		case MSM_SUBMIT_CMD_CTX_RESTORE_BUF:

			if (priv->lastctx == ctx)

			if (priv->lastctx == submit->queue->ctx)

				break;

			/* fall-thru */

		case MSM_SUBMIT_CMD_BUF:

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

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

}



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

		struct msm_file_private *ctx)

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

{

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

	struct msm_drm_private *priv = gpu->dev->dev_private;
@@ -455,7 +454,7 @@ void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 
			break;

		case MSM_SUBMIT_CMD_CTX_RESTORE_BUF:

			/* ignore if there has not been a ctx switch: */

			if (priv->lastctx == ctx)

			if (priv->lastctx == submit->queue->ctx)

				break;

			/* fall-thru */

		case MSM_SUBMIT_CMD_BUF:

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

+1 −2
Original line number Diff line number Diff line
@@ -269,8 +269,7 @@ struct drm_gem_object *adreno_fw_create_bo(struct msm_gpu *gpu, 
		const struct firmware *fw, u64 *iova);

int adreno_hw_init(struct msm_gpu *gpu);

void adreno_recover(struct msm_gpu *gpu);

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

		struct msm_file_private *ctx);

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

void adreno_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring);

bool adreno_idle(struct msm_gpu *gpu, struct msm_ringbuffer *ring);

#if defined(CONFIG_DEBUG_FS) || defined(CONFIG_DEV_COREDUMP)

drivers/gpu/drm/msm/msm_gem_submit.c

+1 −1
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
		}

	}



	msm_gpu_submit(gpu, submit, ctx);

	msm_gpu_submit(gpu, submit);



	args->fence = submit->fence->seqno;

CRA Git | Maintained and supported by SUSTech CRA and CCSE