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

Commit c117af8e authored by Jordan Crouse's avatar Jordan Crouse
Browse files

msm: kgsl: Remove support for sparse memory 



We are choosing to go in a different direction for virtual buffer objects
so remove the old sparse code to get it out of the way. In a few cases
we'll add back similar code so there is a bit of churn but its easierto
just delete everything and start over from scratch.

This doesn't remove the uapi definitions for sparse since we're stuck
with those forever but they'll just harmlessly return error.

Change-Id: Ic0dedbad9a79ef321e9510115d64b5019743eb2b
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent 7b54b39b

drivers/gpu/msm/adreno_dispatch.c

+0 −119
Original line number Diff line number Diff line
@@ -357,13 +357,6 @@ static inline void _pop_drawobj(struct adreno_context *drawctxt) 
	drawctxt->queued--;

}



static void _retire_sparseobj(struct kgsl_drawobj_sparse *sparseobj,

				struct adreno_context *drawctxt)

{

	kgsl_sparse_bind(drawctxt->base.proc_priv, sparseobj);

	_retire_timestamp(DRAWOBJ(sparseobj));

}



static int _retire_markerobj(struct kgsl_drawobj_cmd *cmdobj,

				struct adreno_context *drawctxt)

{
@@ -708,76 +701,6 @@ static int sendcmd(struct adreno_device *adreno_dev, 
	return 0;

}





/*

 * Retires all sync objs from the sparse context

 * queue and returns one of the below

 * a) next sparseobj

 * b) -EAGAIN for syncobj with syncpoints pending

 * c) -EINVAL for unexpected drawobj

 * d) NULL for no sparseobj

 */

static struct kgsl_drawobj_sparse *_get_next_sparseobj(

				struct adreno_context *drawctxt)

{

	struct kgsl_drawobj *drawobj;

	unsigned int i = drawctxt->drawqueue_head;

	int ret = 0;



	if (drawctxt->drawqueue_head == drawctxt->drawqueue_tail)

		return NULL;



	for (i = drawctxt->drawqueue_head; i != drawctxt->drawqueue_tail;

			i = DRAWQUEUE_NEXT(i, ADRENO_CONTEXT_DRAWQUEUE_SIZE)) {



		drawobj = drawctxt->drawqueue[i];



		if (drawobj == NULL)

			return NULL;



		if (drawobj->type == SYNCOBJ_TYPE)

			ret = _retire_syncobj(SYNCOBJ(drawobj), drawctxt);

		else if (drawobj->type == SPARSEOBJ_TYPE)

			return SPARSEOBJ(drawobj);

		else

			return ERR_PTR(-EINVAL);



		if (ret == -EAGAIN)

			return ERR_PTR(-EAGAIN);



		continue;

	}



	return NULL;

}



static int _process_drawqueue_sparse(

		struct adreno_context *drawctxt)

{

	struct kgsl_drawobj_sparse *sparseobj;

	int ret = 0;

	unsigned int i;



	for (i = 0; i < ADRENO_CONTEXT_DRAWQUEUE_SIZE; i++) {



		spin_lock(&drawctxt->lock);

		sparseobj = _get_next_sparseobj(drawctxt);

		if (IS_ERR_OR_NULL(sparseobj)) {

			if (IS_ERR(sparseobj))

				ret = PTR_ERR(sparseobj);

			spin_unlock(&drawctxt->lock);

			return ret;

		}



		_pop_drawobj(drawctxt);

		spin_unlock(&drawctxt->lock);



		_retire_sparseobj(sparseobj, drawctxt);

	}



	return 0;

}



/**

 * dispatcher_context_sendcmds() - Send commands from a context to the GPU

 * @adreno_dev: Pointer to the adreno device struct
@@ -797,9 +720,6 @@ static int dispatcher_context_sendcmds(struct adreno_device *adreno_dev, 
	int inflight = _drawqueue_inflight(dispatch_q);

	unsigned int timestamp;



	if (drawctxt->base.flags & KGSL_CONTEXT_SPARSE)

		return _process_drawqueue_sparse(drawctxt);



	if (dispatch_q->inflight >= inflight) {

		spin_lock(&drawctxt->lock);

		_process_drawqueue_get_next_drawobj(drawctxt);
@@ -1264,31 +1184,6 @@ static void _queue_drawobj(struct adreno_context *drawctxt, 
	trace_adreno_cmdbatch_queued(drawobj, drawctxt->queued);

}



static int _queue_sparseobj(struct adreno_device *adreno_dev,

	struct adreno_context *drawctxt, struct kgsl_drawobj_sparse *sparseobj,

	uint32_t *timestamp, unsigned int user_ts)

{

	struct kgsl_drawobj *drawobj = DRAWOBJ(sparseobj);

	int ret;



	ret = get_timestamp(drawctxt, drawobj, timestamp, user_ts);

	if (ret)

		return ret;



	/*

	 * See if we can fastpath this thing - if nothing is

	 * queued bind/unbind without queueing the context

	 */

	if (!drawctxt->queued)

		return 1;



	drawctxt->queued_timestamp = *timestamp;

	_queue_drawobj(drawctxt, drawobj);



	return 0;

}





static int _queue_markerobj(struct adreno_device *adreno_dev,

	struct adreno_context *drawctxt, struct kgsl_drawobj_cmd *markerobj,

	uint32_t *timestamp, unsigned int user_ts)
@@ -1466,20 +1361,6 @@ int adreno_dispatcher_queue_cmds(struct kgsl_device_private *dev_priv, 
			_queue_syncobj(drawctxt, SYNCOBJ(drawobj[i]),

						timestamp);

			break;

		case SPARSEOBJ_TYPE:

			ret = _queue_sparseobj(adreno_dev, drawctxt,

					SPARSEOBJ(drawobj[i]),

					timestamp, user_ts);

			if (ret == 1) {

				spin_unlock(&drawctxt->lock);

				_retire_sparseobj(SPARSEOBJ(drawobj[i]),

						drawctxt);

				return 0;

			} else if (ret) {

				spin_unlock(&drawctxt->lock);

				return ret;

			}

			break;

		default:

			spin_unlock(&drawctxt->lock);

			return -EINVAL;

drivers/gpu/msm/adreno_drawctxt.c

+1 −2
Original line number Diff line number Diff line
@@ -328,8 +328,7 @@ adreno_drawctxt_create(struct kgsl_device_private *dev_priv, 
		KGSL_CONTEXT_IFH_NOP |

		KGSL_CONTEXT_SECURE |

		KGSL_CONTEXT_PREEMPT_STYLE_MASK |

		KGSL_CONTEXT_NO_SNAPSHOT |

		KGSL_CONTEXT_SPARSE);

		KGSL_CONTEXT_NO_SNAPSHOT);



	/* Check for errors before trying to initialize */