| Message ID | 1416982792-11917-2-git-send-email-taki@igel.co.jp (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Hayama-san, On Wed, Nov 26, 2014 at 7:19 AM, Takanari Hayama <taki@igel.co.jp> wrote: > @@ -179,6 +190,10 @@ static void rpf_vdev_queue(struct vsp1_video *video, > struct vsp1_video_buffer *buf) > { > struct vsp1_rwpf *rpf = container_of(video, struct vsp1_rwpf, video); > + int i; > + > + for (i = 0; i < 3; i++) > + rpf->buf_addr[i] = buf->addr[i]; vsp1_video_buffer.addr is "dma_addr_t addr[3];"... BTW, you can use memcpy() instead of an explicit loop. > > vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_Y, > buf->addr[0] + rpf->offsets[0]); > diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.h b/drivers/media/platform/vsp1/vsp1_rwpf.h > index 28dd9e7..1f98fe3 100644 > --- a/drivers/media/platform/vsp1/vsp1_rwpf.h > +++ b/drivers/media/platform/vsp1/vsp1_rwpf.h > @@ -39,6 +39,8 @@ struct vsp1_rwpf { > struct v4l2_rect crop; > > unsigned int offsets[2]; > + > + unsigned int buf_addr[3]; ... hence the above should use dma_addr_t, too. If CONFIG_ARM_LPAE is enabled, CONFIG_ARCH_DMA_ADDR_T_64BIT will be enabled, too, and dma_addr_t will be u64. > }; Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Geert, On 11/26/14, 5:59 PM, Geert Uytterhoeven wrote: > Hi Hayama-san, > > On Wed, Nov 26, 2014 at 7:19 AM, Takanari Hayama <taki@igel.co.jp> wrote: >> @@ -179,6 +190,10 @@ static void rpf_vdev_queue(struct vsp1_video *video, >> struct vsp1_video_buffer *buf) >> { >> struct vsp1_rwpf *rpf = container_of(video, struct vsp1_rwpf, video); >> + int i; >> + >> + for (i = 0; i < 3; i++) >> + rpf->buf_addr[i] = buf->addr[i]; > > vsp1_video_buffer.addr is "dma_addr_t addr[3];"... Oops. Thank you for pointing that out. > BTW, you can use memcpy() instead of an explicit loop. I thought about it too. However, it might not be that straight forward. VSP1 accepts only 32-bit address. If we enable LPAE, the address should be converted and mapped to 32-bit address space via IPMMU. So, once IPMMU is supported, we should do address mapping. So, I guess we should leave this loop as is here, so that we can add some address conversion in the future. >> >> vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_Y, >> buf->addr[0] + rpf->offsets[0]); >> diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.h b/drivers/media/platform/vsp1/vsp1_rwpf.h >> index 28dd9e7..1f98fe3 100644 >> --- a/drivers/media/platform/vsp1/vsp1_rwpf.h >> +++ b/drivers/media/platform/vsp1/vsp1_rwpf.h >> @@ -39,6 +39,8 @@ struct vsp1_rwpf { >> struct v4l2_rect crop; >> >> unsigned int offsets[2]; >> + >> + unsigned int buf_addr[3]; > > ... hence the above should use dma_addr_t, too. > > If CONFIG_ARM_LPAE is enabled, CONFIG_ARCH_DMA_ADDR_T_64BIT > will be enabled, too, and dma_addr_t will be u64. Thanks. Although we cannot support LPAE for VSP1 without IPMMU, I'll change it to dma_addr_t anyway. > >> }; Cheers, Takanari Hayama, Ph.D. (taki@igel.co.jp) IGEL Co.,Ltd. http://www.igel.co.jp/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platform/vsp1/vsp1_rpf.c index d14d26b..79c0db8 100644 --- a/drivers/media/platform/vsp1/vsp1_rpf.c +++ b/drivers/media/platform/vsp1/vsp1_rpf.c @@ -106,11 +106,22 @@ static int rpf_s_stream(struct v4l2_subdev *subdev, int enable) + crop->left * fmtinfo->bpp[0] / 8; pstride = format->plane_fmt[0].bytesperline << VI6_RPF_SRCM_PSTRIDE_Y_SHIFT; + + vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_Y, + rpf->buf_addr[0] + rpf->offsets[0]); + if (format->num_planes > 1) { rpf->offsets[1] = crop->top * format->plane_fmt[1].bytesperline + crop->left * fmtinfo->bpp[1] / 8; pstride |= format->plane_fmt[1].bytesperline << VI6_RPF_SRCM_PSTRIDE_C_SHIFT; + + vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_C0, + rpf->buf_addr[1] + rpf->offsets[1]); + + if (format->num_planes > 2) + vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_C1, + rpf->buf_addr[2] + rpf->offsets[1]); } vsp1_rpf_write(rpf, VI6_RPF_SRCM_PSTRIDE, pstride); @@ -179,6 +190,10 @@ static void rpf_vdev_queue(struct vsp1_video *video, struct vsp1_video_buffer *buf) { struct vsp1_rwpf *rpf = container_of(video, struct vsp1_rwpf, video); + int i; + + for (i = 0; i < 3; i++) + rpf->buf_addr[i] = buf->addr[i]; vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_Y, buf->addr[0] + rpf->offsets[0]); diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.h b/drivers/media/platform/vsp1/vsp1_rwpf.h index 28dd9e7..1f98fe3 100644 --- a/drivers/media/platform/vsp1/vsp1_rwpf.h +++ b/drivers/media/platform/vsp1/vsp1_rwpf.h @@ -39,6 +39,8 @@ struct vsp1_rwpf { struct v4l2_rect crop; unsigned int offsets[2]; + + unsigned int buf_addr[3]; }; static inline struct vsp1_rwpf *to_rwpf(struct v4l2_subdev *subdev)
Source address of VSP1 RPF needs to be reset whenever crop offsets are recalculated. This correctly reflects a crop setting even VIDIOC_QBUF is called before VIDIOIC_STREAMON is called. Signed-off-by: Takanari Hayama <taki@igel.co.jp> --- drivers/media/platform/vsp1/vsp1_rpf.c | 15 +++++++++++++++ drivers/media/platform/vsp1/vsp1_rwpf.h | 2 ++ 2 files changed, 17 insertions(+)