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

Commit 2bcf577e authored by Steve Longerbeam's avatar Steve Longerbeam Committed by Philipp Zabel
Browse files

gpu: ipu-v3: Add ipu_idmac_enable_watermark() 



Adds the function ipu_idmac_enable_watermark(), which enables or disables
watermarking in the IDMAC channel. Enabling watermarking can increase a
channel's AXI bus arbitration priority.

Signed-off-by: default avatarSteve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 6930afdc

drivers/gpu/ipu-v3/ipu-common.c

+25 −0
Original line number Diff line number Diff line
@@ -536,6 +536,31 @@ int ipu_idmac_disable_channel(struct ipuv3_channel *channel) 
}

EXPORT_SYMBOL_GPL(ipu_idmac_disable_channel);



/*

 * The imx6 rev. D TRM says that enabling the WM feature will increase

 * a channel's priority. Refer to Table 36-8 Calculated priority value.

 * The sub-module that is the sink or source for the channel must enable

 * watermark signal for this to take effect (SMFC_WM for instance).

 */

void ipu_idmac_enable_watermark(struct ipuv3_channel *channel, bool enable)

{

	struct ipu_soc *ipu = channel->ipu;

	unsigned long flags;

	u32 val;



	spin_lock_irqsave(&ipu->lock, flags);



	val = ipu_idmac_read(ipu, IDMAC_WM_EN(channel->num));

	if (enable)

		val |= 1 << (channel->num % 32);

	else

		val &= ~(1 << (channel->num % 32));

	ipu_idmac_write(ipu, val, IDMAC_WM_EN(channel->num));



	spin_unlock_irqrestore(&ipu->lock, flags);

}

EXPORT_SYMBOL_GPL(ipu_idmac_enable_watermark);



static int ipu_memory_reset(struct ipu_soc *ipu)

{

	unsigned long timeout;

include/video/imx-ipu-v3.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ void ipu_idmac_put(struct ipuv3_channel *); 


int ipu_idmac_enable_channel(struct ipuv3_channel *channel);

int ipu_idmac_disable_channel(struct ipuv3_channel *channel);

void ipu_idmac_enable_watermark(struct ipuv3_channel *channel, bool enable);

int ipu_idmac_wait_busy(struct ipuv3_channel *channel, int ms);



void ipu_idmac_set_double_buffer(struct ipuv3_channel *channel,