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

Commit 0b449a44 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dmaengine-fix-4.17-rc6' of git://git.infradead.org/users/vkoul/slave-dma 

Pull dmaengine fix from Vinod Koul:

 - qcom bam runtime_pm fix

 - email update for Vinod

* tag 'dmaengine-fix-4.17-rc6' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: qcom: bam_dma: check if the runtime pm enabled
  dmaengine: Update email address for Vinod
parents 423913ad dbad41e7

MAINTAINERS

+1 −1
Original line number Original line Diff line number Diff line
@@ -4309,7 +4309,7 @@ F: Documentation/driver-api/dma-buf.rst 
T:	git git://anongit.freedesktop.org/drm/drm-misc

T:	git git://anongit.freedesktop.org/drm/drm-misc





DMA GENERIC OFFLOAD ENGINE SUBSYSTEM

DMA GENERIC OFFLOAD ENGINE SUBSYSTEM

M:	Vinod Koul <vinod.koul@intel.com>

M:	Vinod Koul <vkoul@kernel.org>

L:	dmaengine@vger.kernel.org

L:	dmaengine@vger.kernel.org

Q:	https://patchwork.kernel.org/project/linux-dmaengine/list/

Q:	https://patchwork.kernel.org/project/linux-dmaengine/list/

S:	Maintained

S:	Maintained

drivers/dma/qcom/bam_dma.c

+13 −5
Original line number Original line Diff line number Diff line
@@ -524,6 +524,14 @@ static int bam_alloc_chan(struct dma_chan *chan) 
	return 0;

	return 0;

}

}





static int bam_pm_runtime_get_sync(struct device *dev)

{

	if (pm_runtime_enabled(dev))

		return pm_runtime_get_sync(dev);



	return 0;

}



/**

/**

 * bam_free_chan - Frees dma resources associated with specific channel

 * bam_free_chan - Frees dma resources associated with specific channel

 * @chan: specified channel

 * @chan: specified channel
@@ -539,7 +547,7 @@ static void bam_free_chan(struct dma_chan *chan) 
	unsigned long flags;

	unsigned long flags;

	int ret;

	int ret;





	ret = pm_runtime_get_sync(bdev->dev);

	ret = bam_pm_runtime_get_sync(bdev->dev);

	if (ret < 0)

	if (ret < 0)

		return;

		return;
@@ -720,7 +728,7 @@ static int bam_pause(struct dma_chan *chan) 
	unsigned long flag;

	unsigned long flag;

	int ret;

	int ret;





	ret = pm_runtime_get_sync(bdev->dev);

	ret = bam_pm_runtime_get_sync(bdev->dev);

	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;
@@ -746,7 +754,7 @@ static int bam_resume(struct dma_chan *chan) 
	unsigned long flag;

	unsigned long flag;

	int ret;

	int ret;





	ret = pm_runtime_get_sync(bdev->dev);

	ret = bam_pm_runtime_get_sync(bdev->dev);

	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;
@@ -852,7 +860,7 @@ static irqreturn_t bam_dma_irq(int irq, void *data) 
	if (srcs & P_IRQ)

	if (srcs & P_IRQ)

		tasklet_schedule(&bdev->task);

		tasklet_schedule(&bdev->task);





	ret = pm_runtime_get_sync(bdev->dev);

	ret = bam_pm_runtime_get_sync(bdev->dev);

	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;
@@ -969,7 +977,7 @@ static void bam_start_dma(struct bam_chan *bchan) 
	if (!vd)

	if (!vd)

		return;

		return;





	ret = pm_runtime_get_sync(bdev->dev);

	ret = bam_pm_runtime_get_sync(bdev->dev);

	if (ret < 0)

	if (ret < 0)

		return;

		return;