msm: kgsl: Modify dispatcher to accept generic objects

Currently dispatcher accepts kgsl_cmdbatch object. This object
is a superset of all the types of objects dispatcher accepts.
Split kgsl_cmdbatch object to SYNC and IB/MARKER objects and
structure the code to make it easier for new type of objects
to be added to the dispatcher queue.

CRs-Fixed: 1054354
Change-Id: I2d482d1081ce6fdb7925243c88ce00ea6b864efe
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>

1 files changed, 35 insertions, 113 deletions

diff --git a/drivers/gpu/msm/adreno_ringbuffer.c b/drivers/gpu/msm/adreno_ringbuffer.c
index de84aad4668c..fc0602a60ac1 100644
--- a/drivers/gpu/msm/adreno_ringbuffer.c
+++ b/drivers/gpu/msm/adreno_ringbuffer.c
@@ -671,85 +671,6 @@ adreno_ringbuffer_issuecmds(struct adreno_ringbuffer *rb,
 		sizedwords, 0, NULL);
 }
 
-/**
- * _ringbuffer_verify_ib() - Check if an IB's size is within a permitted limit
- * @device: The kgsl device pointer
- * @ibdesc: Pointer to the IB descriptor
- */
-static inline bool _ringbuffer_verify_ib(struct kgsl_device_private *dev_priv,
-		struct kgsl_context *context, struct kgsl_memobj_node *ib)
-{
-	struct kgsl_device *device = dev_priv->device;
-	struct kgsl_process_private *private = dev_priv->process_priv;
-
-	/* The maximum allowable size for an IB in the CP is 0xFFFFF dwords */
-	if (ib->size == 0 || ((ib->size >> 2) > 0xFFFFF)) {
-		pr_context(device, context, "ctxt %d invalid ib size %lld\n",
-			context->id, ib->size);
-		return false;
-	}
-
-	/* Make sure that the address is mapped */
-	if (!kgsl_mmu_gpuaddr_in_range(private->pagetable, ib->gpuaddr)) {
-		pr_context(device, context, "ctxt %d invalid ib gpuaddr %llX\n",
-			context->id, ib->gpuaddr);
-		return false;
-	}
-
-	return true;
-}
-
-int
-adreno_ringbuffer_issueibcmds(struct kgsl_device_private *dev_priv,
-				struct kgsl_context *context,
-				struct kgsl_drawobj *drawobj,
-				uint32_t *timestamp)
-{
-	struct kgsl_device *device = dev_priv->device;
-	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
-	struct adreno_context *drawctxt = ADRENO_CONTEXT(context);
-	struct kgsl_memobj_node *ib;
-	int ret;
-
-	if (kgsl_context_invalid(context))
-		return -EDEADLK;
-
-	/* Verify the IBs before they get queued */
-	list_for_each_entry(ib, &drawobj->cmdlist, node)
-		if (_ringbuffer_verify_ib(dev_priv, context, ib) == false)
-			return -EINVAL;
-
-	/* wait for the suspend gate */
-	wait_for_completion(&device->halt_gate);
-
-	/*
-	 * Clear the wake on touch bit to indicate an IB has been
-	 * submitted since the last time we set it. But only clear
-	 * it when we have rendering commands.
-	 */
-	if (!(drawobj->flags & KGSL_DRAWOBJ_MARKER)
-		&& !(drawobj->flags & KGSL_DRAWOBJ_SYNC))
-		device->flags &= ~KGSL_FLAG_WAKE_ON_TOUCH;
-
-	/* A3XX does not have support for drawobj profiling */
-	if (adreno_is_a3xx(adreno_dev) &&
-			(drawobj->flags & KGSL_DRAWOBJ_PROFILING))
-		return -EOPNOTSUPP;
-
-	/* Queue the command in the ringbuffer */
-	ret = adreno_dispatcher_queue_cmd(adreno_dev, drawctxt, drawobj,
-		timestamp);
-
-	/*
-	 * Return -EPROTO if the device has faulted since the last time we
-	 * checked - userspace uses this to perform post-fault activities
-	 */
-	if (!ret && test_and_clear_bit(ADRENO_CONTEXT_FAULT, &context->priv))
-		ret = -EPROTO;
-
-	return ret;
-}
-
 static void adreno_ringbuffer_set_constraint(struct kgsl_device *device,
 			struct kgsl_drawobj *drawobj)
 {
@@ -792,10 +713,12 @@ static inline int _get_alwayson_counter(struct adreno_device *adreno_dev,
 
 /* adreno_rindbuffer_submitcmd - submit userspace IBs to the GPU */
 int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
-		struct kgsl_drawobj *drawobj, struct adreno_submit_time *time)
+		struct kgsl_drawobj_cmd *cmdobj,
+		struct adreno_submit_time *time)
 {
 	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);
 	struct adreno_gpudev *gpudev = ADRENO_GPU_DEVICE(adreno_dev);
+	struct kgsl_drawobj *drawobj = DRAWOBJ(cmdobj);
 	struct kgsl_memobj_node *ib;
 	unsigned int numibs = 0;
 	unsigned int *link;
@@ -803,8 +726,8 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
 	struct kgsl_context *context;
 	struct adreno_context *drawctxt;
 	bool use_preamble = true;
-	bool drawobj_user_profiling = false;
-	bool drawobj_kernel_profiling = false;
+	bool user_profiling = false;
+	bool kernel_profiling = false;
 	int flags = KGSL_CMD_FLAGS_NONE;
 	int ret;
 	struct adreno_ringbuffer *rb;
@@ -812,16 +735,16 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
 	unsigned int dwords = 0;
 	struct adreno_submit_time local;
 
-	struct kgsl_mem_entry *entry = drawobj->profiling_buf_entry;
+	struct kgsl_mem_entry *entry = cmdobj->profiling_buf_entry;
 	if (entry)
 		profile_buffer = kgsl_gpuaddr_to_vaddr(&entry->memdesc,
-					drawobj->profiling_buffer_gpuaddr);
+					cmdobj->profiling_buffer_gpuaddr);
 
 	context = drawobj->context;
 	drawctxt = ADRENO_CONTEXT(context);
 
 	/* Get the total IBs in the list */
-	list_for_each_entry(ib, &drawobj->cmdlist, node)
+	list_for_each_entry(ib, &cmdobj->cmdlist, node)
 		numibs++;
 
 	rb = drawctxt->rb;
@@ -838,11 +761,11 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
 	 * c) force preamble for commandbatch
 	 */
 	if (test_bit(ADRENO_CONTEXT_SKIP_CMD, &drawctxt->base.priv) &&
-		(!test_bit(DRAWOBJ_FLAG_SKIP, &drawobj->priv))) {
+		(!test_bit(CMDOBJ_SKIP, &cmdobj->priv))) {
 
-		set_bit(KGSL_FT_SKIPCMD, &drawobj->fault_recovery);
-		drawobj->fault_policy = drawctxt->fault_policy;
-		set_bit(DRAWOBJ_FLAG_FORCE_PREAMBLE, &drawobj->priv);
+		set_bit(KGSL_FT_SKIPCMD, &cmdobj->fault_recovery);
+		cmdobj->fault_policy = drawctxt->fault_policy;
+		set_bit(CMDOBJ_FORCE_PREAMBLE, &cmdobj->priv);
 
 		/* if context is detached print fault recovery */
 		adreno_fault_skipcmd_detached(adreno_dev, drawctxt, drawobj);
@@ -857,7 +780,7 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
 	if a context switch hasn't occured */
 
 	if ((drawctxt->base.flags & KGSL_CONTEXT_PREAMBLE) &&
-		!test_bit(DRAWOBJ_FLAG_FORCE_PREAMBLE, &drawobj->priv) &&
+		!test_bit(CMDOBJ_FORCE_PREAMBLE, &cmdobj->priv) &&
 		(rb->drawctxt_active == drawctxt))
 		use_preamble = false;
 
@@ -867,7 +790,7 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
 	 * the accounting sane. Set start_index and numibs to 0 to just
 	 * generate the start and end markers and skip everything else
 	 */
-	if (test_bit(DRAWOBJ_FLAG_SKIP, &drawobj->priv)) {
+	if (test_bit(CMDOBJ_SKIP, &cmdobj->priv)) {
 		use_preamble = false;
 		numibs = 0;
 	}
@@ -886,7 +809,7 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
 
 	if (drawobj->flags & KGSL_DRAWOBJ_PROFILING &&
 		!adreno_is_a3xx(adreno_dev) && profile_buffer) {
-		drawobj_user_profiling = true;
+		user_profiling = true;
 		dwords += 6;
 
 		/*
@@ -907,8 +830,8 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
 			time = &local;
 	}
 
-	if (test_bit(DRAWOBJ_FLAG_PROFILE, &drawobj->priv)) {
-		drawobj_kernel_profiling = true;
+	if (test_bit(CMDOBJ_PROFILE, &cmdobj->priv)) {
+		kernel_profiling = true;
 		dwords += 6;
 		if (adreno_is_a5xx(adreno_dev))
 			dwords += 2;
@@ -929,26 +852,26 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
 	*cmds++ = cp_packet(adreno_dev, CP_NOP, 1);
 	*cmds++ = KGSL_START_OF_IB_IDENTIFIER;
 
-	if (drawobj_kernel_profiling) {
+	if (kernel_profiling) {
 		cmds += _get_alwayson_counter(adreno_dev, cmds,
 			adreno_dev->profile_buffer.gpuaddr +
-			ADRENO_DRAWOBJ_PROFILE_OFFSET(drawobj->profile_index,
+			ADRENO_DRAWOBJ_PROFILE_OFFSET(cmdobj->profile_index,
 				started));
 	}
 
 	/*
-	 * Add cmds to read the GPU ticks at the start of the drawobj and
-	 * write it into the appropriate drawobj profiling buffer offset
+	 * Add cmds to read the GPU ticks at the start of command obj and
+	 * write it into the appropriate command obj profiling buffer offset
 	 */
-	if (drawobj_user_profiling) {
+	if (user_profiling) {
 		cmds += _get_alwayson_counter(adreno_dev, cmds,
-			drawobj->profiling_buffer_gpuaddr +
+			cmdobj->profiling_buffer_gpuaddr +
 			offsetof(struct kgsl_drawobj_profiling_buffer,
 			gpu_ticks_submitted));
 	}
 
 	if (numibs) {
-		list_for_each_entry(ib, &drawobj->cmdlist, node) {
+		list_for_each_entry(ib, &cmdobj->cmdlist, node) {
 			/*
 			 * Skip 0 sized IBs - these are presumed to have been
 			 * removed from consideration by the FT policy
@@ -972,20 +895,20 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
 				adreno_is_preemption_enabled(adreno_dev))
 		cmds += gpudev->preemption_yield_enable(cmds);
 
-	if (drawobj_kernel_profiling) {
+	if (kernel_profiling) {
 		cmds += _get_alwayson_counter(adreno_dev, cmds,
 			adreno_dev->profile_buffer.gpuaddr +
-			ADRENO_DRAWOBJ_PROFILE_OFFSET(drawobj->profile_index,
+			ADRENO_DRAWOBJ_PROFILE_OFFSET(cmdobj->profile_index,
 				retired));
 	}
 
 	/*
-	 * Add cmds to read the GPU ticks at the end of the drawobj and
-	 * write it into the appropriate drawobj profiling buffer offset
+	 * Add cmds to read the GPU ticks at the end of command obj and
+	 * write it into the appropriate command obj profiling buffer offset
 	 */
-	if (drawobj_user_profiling) {
+	if (user_profiling) {
 		cmds += _get_alwayson_counter(adreno_dev, cmds,
-			drawobj->profiling_buffer_gpuaddr +
+			cmdobj->profiling_buffer_gpuaddr +
 			offsetof(struct kgsl_drawobj_profiling_buffer,
 			gpu_ticks_retired));
 	}
@@ -1012,7 +935,7 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
 		goto done;
 	}
 
-	if (test_bit(DRAWOBJ_FLAG_WFI, &drawobj->priv))
+	if (test_bit(CMDOBJ_WFI, &cmdobj->priv))
 		flags = KGSL_CMD_FLAGS_WFI;
 
 	/*
@@ -1028,7 +951,7 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
 	adreno_ringbuffer_set_constraint(device, drawobj);
 
 	/* CFF stuff executed only if CFF is enabled */
-	kgsl_cffdump_capture_ib_desc(device, context, drawobj);
+	kgsl_cffdump_capture_ib_desc(device, context, cmdobj);
 
 
 	ret = adreno_ringbuffer_addcmds(rb, flags,
@@ -1036,10 +959,10 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
 					drawobj->timestamp, time);
 
 	if (!ret) {
-		drawobj->global_ts = drawctxt->internal_timestamp;
+		cmdobj->global_ts = drawctxt->internal_timestamp;
 
 		/* Put the timevalues in the profiling buffer */
-		if (drawobj_user_profiling) {
+		if (user_profiling) {
 			/*
 			* Return kernel clock time to the the client
 			* if requested
@@ -1069,8 +992,7 @@ done:
 		kgsl_memdesc_unmap(&entry->memdesc);
 
 
-	trace_kgsl_issueibcmds(device, context->id, drawobj,
-			numibs, drawobj->timestamp,
+	trace_kgsl_issueibcmds(device, context->id, numibs, drawobj->timestamp,
 			drawobj->flags, ret, drawctxt->type);
 
 	kfree(link);