diff for duplicates of <20150506010310.24f82a42@bones> diff --git a/a/1.txt b/N1/1.txt index 62c57cf..8b6eee9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,10 +5,10 @@ On Mon, 04 May 2015 02:32:05 +0300 Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > > +/* > > + * -> > ==================================== +> > ======================================================================== > > + * video ioctl operations > > + * -> > ==================================== +> > ======================================================================== > > + */ > > +static void put_qtbl(u8 *p, const unsigned int *qtbl) > > +{ @@ -38,10 +38,10 @@ bytes vs 162 bytes) > > > +/* > > + * -> > ==================================== +> > ======================================================================== > > + * Queue operations > > + * -> > --=================================== +> > --====================================================================== > > + */ > > +static int jpu_queue_setup(struct vb2_queue *vq, > > + const struct v4l2_format *fmt, @@ -96,9 +96,12 @@ I'm a little bit frustrated here :) > > + unsigned int redu, inft, w, h; > > + u8 *dst_vaddr; > > + struct jpu_q_data *q_data = &ctx->out_q; -> > + unsigned char subsampling > > q_data->fmtinfo->subsampling; + -> > + src_1_addr > > vb2_dma_contig_plane_dma_addr(src_buf, 0); -> > + src_2_addr > > vb2_dma_contig_plane_dma_addr(src_buf, 1); + +> > + unsigned char subsampling = +> > q_data->fmtinfo->subsampling; + +> > + src_1_addr = +> > vb2_dma_contig_plane_dma_addr(src_buf, 0); +> > + src_2_addr = +> > vb2_dma_contig_plane_dma_addr(src_buf, 1); + > > + dst_addr = vb2_dma_contig_plane_dma_addr(dst_buf, > > 0); > > + dst_vaddr = vb2_plane_vaddr(dst_buf, 0); @@ -109,8 +112,10 @@ I'm a little bit frustrated here :) > > + > > + memcpy(dst_vaddr, jpeg_hdrs[ctx->compr_quality], > > + JPU_JPEG_HDR_SIZE); -> > + *(u16 *)(dst_vaddr + JPU_JPEG_HEIGHT_OFFSET) > > cpu_to_be16(h); -> > + *(u16 *)(dst_vaddr + JPU_JPEG_WIDTH_OFFSET) > > cpu_to_be16(w); +> > + *(u16 *)(dst_vaddr + JPU_JPEG_HEIGHT_OFFSET) = +> > cpu_to_be16(h); +> > + *(u16 *)(dst_vaddr + JPU_JPEG_WIDTH_OFFSET) = +> > cpu_to_be16(w); > > + *(dst_vaddr + JPU_JPEG_SUBS_OFFSET) = subsampling; > > At this point I think the buffer belongs to the device. Have you @@ -128,7 +133,7 @@ v4l2_m2m_buf_done? > > +{ > > + struct jpu *jpu = dev_get_drvdata(dev); > > + -> > + if (jpu->ref_count = 0) +> > + if (jpu->ref_count == 0) > > + return 0; > > + > > + clk_disable_unprepare(jpu->clk); diff --git a/a/content_digest b/N1/content_digest index 2a37a44..80a7ed7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\05004544.CpPfGJfHMn@avalon\0" "From\0Mikhail Ulianov <mikhail.ulyanov@cogentembedded.com>\0" "Subject\0Re: [PATCH v3 1/1] V4L2: platform: Renesas R-Car JPEG codec driver\0" - "Date\0Tue, 05 May 2015 22:03:10 +0000\0" + "Date\0Wed, 6 May 2015 01:03:10 +0300\0" "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Cc\0hverkuil@xs4all.nl" horms@verge.net.au @@ -19,10 +19,10 @@ "Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote:\n" "> > +/*\n" "> > + *\n" - "> > ====================================\n" + "> > ========================================================================\n" "> > + * video ioctl operations\n" "> > + *\n" - "> > ====================================\n" + "> > ========================================================================\n" "> > + */\n" "> > +static void put_qtbl(u8 *p, const unsigned int *qtbl)\n" "> > +{\n" @@ -52,10 +52,10 @@ "> \n" "> > +/*\n" "> > + *\n" - "> > ====================================\n" + "> > ========================================================================\n" "> > + * Queue operations\n" "> > + *\n" - "> > --===================================\n" + "> > --======================================================================\n" "> > + */\n" "> > +static int jpu_queue_setup(struct vb2_queue *vq,\n" "> > +\t\t\t const struct v4l2_format *fmt,\n" @@ -110,9 +110,12 @@ "> > +\t\tunsigned int redu, inft, w, h;\n" "> > +\t\tu8 *dst_vaddr;\n" "> > +\t\tstruct jpu_q_data *q_data = &ctx->out_q;\n" - "> > +\t\tunsigned char subsampling > > q_data->fmtinfo->subsampling; +\n" - "> > +\t\tsrc_1_addr > > vb2_dma_contig_plane_dma_addr(src_buf, 0);\n" - "> > +\t\tsrc_2_addr > > vb2_dma_contig_plane_dma_addr(src_buf, 1); +\n" + "> > +\t\tunsigned char subsampling =\n" + "> > q_data->fmtinfo->subsampling; +\n" + "> > +\t\tsrc_1_addr =\n" + "> > vb2_dma_contig_plane_dma_addr(src_buf, 0);\n" + "> > +\t\tsrc_2_addr =\n" + "> > vb2_dma_contig_plane_dma_addr(src_buf, 1); +\n" "> > +\t\tdst_addr = vb2_dma_contig_plane_dma_addr(dst_buf,\n" "> > 0);\n" "> > +\t\tdst_vaddr = vb2_plane_vaddr(dst_buf, 0);\n" @@ -123,8 +126,10 @@ "> > +\n" "> > +\t\tmemcpy(dst_vaddr, jpeg_hdrs[ctx->compr_quality],\n" "> > +\t\t\tJPU_JPEG_HDR_SIZE);\n" - "> > +\t\t*(u16 *)(dst_vaddr + JPU_JPEG_HEIGHT_OFFSET) > > cpu_to_be16(h);\n" - "> > +\t\t*(u16 *)(dst_vaddr + JPU_JPEG_WIDTH_OFFSET) > > cpu_to_be16(w);\n" + "> > +\t\t*(u16 *)(dst_vaddr + JPU_JPEG_HEIGHT_OFFSET) =\n" + "> > cpu_to_be16(h);\n" + "> > +\t\t*(u16 *)(dst_vaddr + JPU_JPEG_WIDTH_OFFSET) =\n" + "> > cpu_to_be16(w);\n" "> > +\t\t*(dst_vaddr + JPU_JPEG_SUBS_OFFSET) = subsampling;\n" "> \n" "> At this point I think the buffer belongs to the device. Have you\n" @@ -142,7 +147,7 @@ "> > +{\n" "> > +\tstruct jpu *jpu = dev_get_drvdata(dev);\n" "> > +\n" - "> > +\tif (jpu->ref_count = 0)\n" + "> > +\tif (jpu->ref_count == 0)\n" "> > +\t\treturn 0;\n" "> > +\n" "> > +\tclk_disable_unprepare(jpu->clk);\n" @@ -154,4 +159,4 @@ "> the JPU.\n" It works just fine. -8fe911b05dbe5612be5a407ca67bc0a36217a152245f34220d3991559b2009ce +4e024c4d576de15bf2baccbf0f67d95d424e7547d100daba51b60ecd69ca65ad
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.