From d616100c256976f5ce899452bafcaaae636d811a Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Fri, 16 Mar 2012 19:14:53 -0300 Subject: [PATCH] --- yaml --- r: 295113 b: refs/heads/master c: 121bbe254a46e075673e6b9eec5613ea16400ccc h: refs/heads/master i: 295111: 3921389cc2a07cfd17b194e4b87bf7eb56c7f71b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/marvell-ccic/mcam-core.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0a436dbe0c59..872844e70789 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 482d35c41f2efb0408624e222bbc9efc0b3518eb +refs/heads/master: 121bbe254a46e075673e6b9eec5613ea16400ccc diff --git a/trunk/drivers/media/video/marvell-ccic/mcam-core.c b/trunk/drivers/media/video/marvell-ccic/mcam-core.c index 050724f8d3e6..e46a72af63c4 100644 --- a/trunk/drivers/media/video/marvell-ccic/mcam-core.c +++ b/trunk/drivers/media/video/marvell-ccic/mcam-core.c @@ -509,11 +509,17 @@ static void mcam_sg_next_buffer(struct mcam_camera *cam) buf = list_first_entry(&cam->buffers, struct mcam_vb_buffer, queue); list_del_init(&buf->queue); + /* + * Very Bad Not Good Things happen if you don't clear + * C1_DESC_ENA before making any descriptor changes. + */ + mcam_reg_clear_bit(cam, REG_CTRL1, C1_DESC_ENA); mcam_reg_write(cam, REG_DMA_DESC_Y, buf->dma_desc_pa); mcam_reg_write(cam, REG_DESC_LEN_Y, buf->dma_desc_nent*sizeof(struct mcam_dma_desc)); mcam_reg_write(cam, REG_DESC_LEN_U, 0); mcam_reg_write(cam, REG_DESC_LEN_V, 0); + mcam_reg_set_bit(cam, REG_CTRL1, C1_DESC_ENA); cam->vb_bufs[0] = buf; } @@ -533,7 +539,6 @@ static void mcam_ctlr_dma_sg(struct mcam_camera *cam) mcam_reg_clear_bit(cam, REG_CTRL1, C1_DESC_3WORD); mcam_sg_next_buffer(cam); - mcam_reg_set_bit(cam, REG_CTRL1, C1_DESC_ENA); cam->nbufs = 3; } @@ -560,18 +565,12 @@ static void mcam_dma_sg_done(struct mcam_camera *cam, int frame) */ if (cam->state != S_STREAMING) return; - /* - * Very Bad Not Good Things happen if you don't clear - * C1_DESC_ENA before making any descriptor changes. - */ - mcam_reg_clear_bit(cam, REG_CTRL1, C1_DESC_ENA); /* * If we have another buffer available, put it in and * restart the engine. */ if (!list_empty(&cam->buffers)) { mcam_sg_next_buffer(cam); - mcam_reg_set_bit(cam, REG_CTRL1, C1_DESC_ENA); mcam_ctlr_start(cam); /* * Otherwise set CF_SG_RESTART and the controller will