iMX/i2som-imx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MLK-20923: ISI: improve ISI memory to memory performance

Browse Source 
Refer to ISI validataion code, there is no need to enable ISI
mem2mem read done interrupt and driver can handle buffers in
frame received interrupt service

Remove 50ms delay when enable ISI AXI read, it will improve
performance obviously

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit bdabe035cd5c57d713f824e61f120213ed9357ba)
(cherry picked from commit 7dd4c6affa)
This commit is contained in:
Guoniu.Zhou
2019-02-13 18:50:39 +08:00
parent d73147aa2b
commit 71085ec3fa
4 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/imx8/mxc-isi-core.c
View File

@ -22,9 +22,6 @@ static irqreturn_t mxc_isi_irq_handler(int irq, void *priv)
status = mxc_isi_get_irq_status(mxc_isi);
mxc_isi_clean_irq_status(mxc_isi, status);
if (status & CHNL_STS_MEM_RD_DONE_MASK)
mxc_isi_m2m_frame_read_done(mxc_isi);
if (status & CHNL_STS_FRM_STRD_MASK) {
if (mxc_isi->is_m2m)
mxc_isi_m2m_frame_write_done(mxc_isi);
@ -140,6 +137,7 @@ static int mxc_isi_probe(struct platform_device *pdev)
init_waitqueue_head(&mxc_isi->irq_queue);
spin_lock_init(&mxc_isi->slock);
mutex_init(&mxc_isi->lock);
mutex_init(&mxc_isi->m2m_lock);
atomic_set(&mxc_isi->open_count, 0);
mxc_isi->clk = devm_clk_get(dev, NULL);

2
drivers/media/platform/imx8/mxc-isi-core.h
View File

@ -241,7 +241,6 @@ struct mxc_isi_m2m_dev {
unsigned int alphaen:1;
unsigned int aborting;
unsigned int read_done;
unsigned int frame_count;
struct list_head out_active;
@ -276,6 +275,7 @@ struct mxc_isi_cap_dev {
struct mxc_isi_dev {
spinlock_t slock;
struct mutex lock;
struct mutex m2m_lock;
wait_queue_head_t irq_queue;
int id;

3
drivers/media/platform/imx8/mxc-isi-hw.c
View File

@ -644,9 +644,6 @@ void mxc_isi_enable_irq(struct mxc_isi_dev *mxc_isi)
CHNL_IER_OFLW_PANIC_Y_BUF_EN_MASK |
CHNL_IER_EXCS_OFLW_Y_BUF_EN_MASK |
CHNL_IER_OFLW_Y_BUF_EN_MASK;
if (mxc_isi->is_m2m)
val |= CHNL_IER_MEM_RD_DONE_EN_MASK;
writel(val, mxc_isi->regs + CHNL_IER);
}

27
drivers/media/platform/imx8/mxc-isi-m2m.c
View File

@ -129,7 +129,6 @@ static void mxc_isi_m2m_device_run(void *priv)
unlock:
spin_unlock_irqrestore(&mxc_isi->slock, flags);
msleep(50);
}
static int mxc_isi_m2m_job_ready(void *priv)
@ -306,6 +305,7 @@ static int m2m_vb2_start_streaming(struct vb2_queue *q, unsigned int count)
list_add_tail(&b->list, &mxc_isi->m2m.out_active);
mxc_isi->m2m.frame_count = 1;
mxc_isi->m2m.aborting = 0;
unlock:
spin_unlock_irqrestore(&mxc_isi->slock, flags);
@ -364,7 +364,7 @@ static int mxc_m2m_queue_init(void *priv, struct vb2_queue *src_vq,
src_vq->ops = &mxc_m2m_vb2_qops;
src_vq->mem_ops = &vb2_dma_contig_memops;
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->lock = &mxc_isi->lock;
src_vq->lock = &mxc_isi->m2m_lock;
src_vq->dev = &mxc_isi->pdev->dev;
ret = vb2_queue_init(src_vq);
@ -378,7 +378,7 @@ static int mxc_m2m_queue_init(void *priv, struct vb2_queue *src_vq,
dst_vq->ops = &mxc_m2m_vb2_qops;
dst_vq->mem_ops = &vb2_dma_contig_memops;
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->lock = &mxc_isi->lock;
dst_vq->lock = &mxc_isi->m2m_lock;
dst_vq->dev = &mxc_isi->pdev->dev;
ret = vb2_queue_init(dst_vq);
@ -401,7 +401,7 @@ static int mxc_isi_m2m_open(struct file *file)
return -EBUSY;
}
if (mutex_lock_interruptible(&mxc_isi->lock))
if (mutex_lock_interruptible(&mxc_isi->m2m_lock))
return -ERESTARTSYS;
mxc_ctx = kzalloc(sizeof(*mxc_ctx), GFP_KERNEL);
if (!mxc_ctx) {
@ -431,7 +431,7 @@ static int mxc_isi_m2m_open(struct file *file)
mxc_isi->is_m2m = 1;
unlock:
mutex_unlock(&mxc_isi->lock);
mutex_unlock(&mxc_isi->m2m_lock);
return ret;
}
@ -446,9 +446,12 @@ static int mxc_isi_m2m_release(struct file *file)
v4l2_fh_del(&mxc_ctx->fh);
v4l2_fh_exit(&mxc_ctx->fh);
mutex_lock(&mxc_isi->lock);
if (mutex_is_locked(&mxc_isi->m2m_lock))
mutex_unlock(&mxc_isi->m2m_lock);
mutex_lock(&mxc_isi->m2m_lock);
v4l2_m2m_ctx_release(mxc_ctx->fh.m2m_ctx);
mutex_unlock(&mxc_isi->lock);
mutex_unlock(&mxc_isi->m2m_lock);
kfree(mxc_ctx);
if (atomic_dec_and_test(&mxc_isi->open_count))
@ -1027,12 +1030,6 @@ void mxc_isi_unregister_m2m_device(struct mxc_isi_dev *mxc_isi)
v4l2_m2m_release(mxc_isi->m2m.m2m_dev);
}
void mxc_isi_m2m_frame_read_done(struct mxc_isi_dev *mxc_isi)
{
dev_dbg(&mxc_isi->pdev->dev, "%s\n", __func__);
mxc_isi->m2m.read_done = 1;
}
void mxc_isi_m2m_frame_write_done(struct mxc_isi_dev *mxc_isi)
{
struct v4l2_fh *fh;
@ -1051,9 +1048,6 @@ void mxc_isi_m2m_frame_write_done(struct mxc_isi_dev *mxc_isi)
}
fh = &curr_mxc_ctx->fh;
if (!mxc_isi->m2m.read_done)
return;
if (mxc_isi->m2m.aborting) {
mxc_isi_channel_disable(mxc_isi);
dev_warn(&mxc_isi->pdev->dev, "Aborting current job\n");
@ -1108,5 +1102,4 @@ void mxc_isi_m2m_frame_write_done(struct mxc_isi_dev *mxc_isi)
job_finish:
v4l2_m2m_job_finish(mxc_isi->m2m.m2m_dev, fh->m2m_ctx);
mxc_isi->m2m.read_done = 0;
}