diff for duplicates of <5695336.CA8eQ67zhi@avalon> diff --git a/a/1.txt b/N1/1.txt index 91ef70b..570ea5a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,9 +5,9 @@ Hi Mikhail, On Wednesday 06 May 2015 01:03:10 Mikhail Ulianov wrote: > On Mon, 04 May 2015 02:32:05 +0300 Laurent Pinchart wrote: > >> +/* -> >> + * ================================== +> >> + * ==================================================================== > >> + * video ioctl operations -> >> + * ================================== +> >> + * ==================================================================== > >> + */ > >> +static void put_qtbl(u8 *p, const unsigned int *qtbl) > >> +{ @@ -41,9 +41,9 @@ My bad, you're right. > [snip] > > >> +/* -> >> + * ================================== +> >> + * ==================================================================== > >> + * Queue operations -> >> + * ================================== +> >> + * ==================================================================== > >> + */ > >> +static int jpu_queue_setup(struct vb2_queue *vq, > >> + const struct v4l2_format *fmt, @@ -105,9 +105,12 @@ Kamil, do you have a comment on that ? > >> + 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); @@ -118,8 +121,10 @@ Kamil, do you have a comment on that ? > >> + > >> + 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 @@ -140,7 +145,7 @@ I meant in the queue .buffer_prepare() operation. > >> +{ > >> + 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 4d1584f..f1636f4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020150506010310.24f82a42@bones\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v3 1/1] V4L2: platform: Renesas R-Car JPEG codec driver\0" - "Date\0Thu, 18 Jun 2015 19:48:58 +0000\0" + "Date\0Thu, 18 Jun 2015 22:48:58 +0300\0" "To\0Mikhail Ulianov <mikhail.ulyanov@cogentembedded.com>\0" "Cc\0hverkuil@xs4all.nl" horms@verge.net.au @@ -21,9 +21,9 @@ "On Wednesday 06 May 2015 01:03:10 Mikhail Ulianov wrote:\n" "> On Mon, 04 May 2015 02:32:05 +0300 Laurent Pinchart wrote:\n" "> >> +/*\n" - "> >> + * ==================================\n" + "> >> + * ====================================================================\n" "> >> + * video ioctl operations\n" - "> >> + * ==================================\n" + "> >> + * ====================================================================\n" "> >> + */\n" "> >> +static void put_qtbl(u8 *p, const unsigned int *qtbl)\n" "> >> +{\n" @@ -57,9 +57,9 @@ "> [snip]\n" "> \n" "> >> +/*\n" - "> >> + * ==================================\n" + "> >> + * ====================================================================\n" "> >> + * Queue operations\n" - "> >> + * ==================================\n" + "> >> + * ====================================================================\n" "> >> + */\n" "> >> +static int jpu_queue_setup(struct vb2_queue *vq,\n" "> >> +\t\t\t const struct v4l2_format *fmt,\n" @@ -121,9 +121,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" @@ -134,8 +137,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" @@ -156,7 +161,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" @@ -176,4 +181,4 @@ "\n" Laurent Pinchart -95c964efd477888e5dc0a6698c3c82cffd6c6a596b8ed6e9c260a6e3d9e5396f +0522e5d62271b73bdb603a269160c08e8e91e469ba113f7bbc5aa84b9751ef5d
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.