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

Commit 701c1edb authored by Maxime Ripard's avatar Maxime Ripard Committed by Vinod Koul
Browse files

dmaengine: ipu-idmac: Split device_control 



Split the device_control callback of the IPU IDMAC driver to make use
of the newly introduced callbacks, that will eventually be used to retrieve
slave capabilities.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 71b5bd2a

drivers/dma/ipu/ipu_idmac.c

+51 −45
Original line number Diff line number Diff line
@@ -1398,18 +1398,16 @@ static void idmac_issue_pending(struct dma_chan *chan) 
	 */

}



static int __idmac_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,

			   unsigned long arg)

static int idmac_pause(struct dma_chan *chan)

{

	struct idmac_channel *ichan = to_idmac_chan(chan);

	struct idmac *idmac = to_idmac(chan->device);

	struct ipu *ipu = to_ipu(idmac);

	struct list_head *list, *tmp;

	unsigned long flags;

	int i;



	switch (cmd) {

	case DMA_PAUSE:

	mutex_lock(&ichan->chan_mutex);



	spin_lock_irqsave(&ipu->lock, flags);

	ipu_ic_disable_task(ipu, chan->chan_id);
@@ -1423,8 +1421,20 @@ static int __idmac_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, 
	spin_unlock_irqrestore(&ipu->lock, flags);



	ichan->status = IPU_CHANNEL_INITIALIZED;

		break;

	case DMA_TERMINATE_ALL:



	mutex_unlock(&ichan->chan_mutex);



	return 0;

}



static int __idmac_terminate_all(struct dma_chan *chan)

{

	struct idmac_channel *ichan = to_idmac_chan(chan);

	struct idmac *idmac = to_idmac(chan->device);

	struct ipu *ipu = to_ipu(idmac);

	unsigned long flags;

	int i;



	ipu_disable_channel(idmac, ichan,

			    ichan->status >= IPU_CHANNEL_ENABLED);
@@ -1451,23 +1461,18 @@ static int __idmac_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, 
	tasklet_enable(&ipu->tasklet);



	ichan->status = IPU_CHANNEL_INITIALIZED;

		break;

	default:

		return -ENOSYS;

	}



	return 0;

}



static int idmac_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,

			 unsigned long arg)

static int idmac_terminate_all(struct dma_chan *chan)

{

	struct idmac_channel *ichan = to_idmac_chan(chan);

	int ret;



	mutex_lock(&ichan->chan_mutex);



	ret = __idmac_control(chan, cmd, arg);

	ret = __idmac_terminate_all(chan);



	mutex_unlock(&ichan->chan_mutex);
@@ -1568,7 +1573,7 @@ static void idmac_free_chan_resources(struct dma_chan *chan) 


	mutex_lock(&ichan->chan_mutex);



	__idmac_control(chan, DMA_TERMINATE_ALL, 0);

	__idmac_terminate_all(chan);



	if (ichan->status > IPU_CHANNEL_FREE) {

#ifdef DEBUG
@@ -1622,7 +1627,8 @@ static int __init ipu_idmac_init(struct ipu *ipu) 


	/* Compulsory for DMA_SLAVE fields */

	dma->device_prep_slave_sg		= idmac_prep_slave_sg;

	dma->device_control			= idmac_control;

	dma->device_pause			= idmac_pause;

	dma->device_terminate_all		= idmac_terminate_all;



	INIT_LIST_HEAD(&dma->channels);

	for (i = 0; i < IPU_CHANNELS_NUM; i++) {
@@ -1655,7 +1661,7 @@ static void ipu_idmac_exit(struct ipu *ipu) 
	for (i = 0; i < IPU_CHANNELS_NUM; i++) {

		struct idmac_channel *ichan = ipu->channel + i;



		idmac_control(&ichan->dma_chan, DMA_TERMINATE_ALL, 0);

		idmac_terminate_all(&ichan->dma_chan);

	}



	dma_async_device_unregister(&idmac->dma);