Message ID | 1378991371-24428-4-git-send-email-shaik.ameer@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Shaik, I have a few questions regarding the selection part... On 09/12/2013 03:09 PM, Shaik Ameer Basha wrote: > This patch adds the Makefile and memory to memory (m2m) interface > functionality for the SCALER driver. > > Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com> > --- > drivers/media/platform/Kconfig | 8 + > drivers/media/platform/Makefile | 1 + > drivers/media/platform/exynos-scaler/Makefile | 3 + > drivers/media/platform/exynos-scaler/scaler-m2m.c | 781 +++++++++++++++++++++ > 4 files changed, 793 insertions(+) > create mode 100644 drivers/media/platform/exynos-scaler/Makefile > create mode 100644 drivers/media/platform/exynos-scaler/scaler-m2m.c > ... > + > +static int scaler_m2m_g_selection(struct file *file, void *fh, > + struct v4l2_selection *s) > +{ > + struct scaler_frame *frame; > + struct scaler_ctx *ctx = fh_to_ctx(fh); > + > + if ((s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) && > + (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)) > + return -EINVAL; > + > + frame = ctx_get_frame(ctx, s->type); > + if (IS_ERR(frame)) > + return PTR_ERR(frame); > + > + switch (s->target) { > + case V4L2_SEL_TGT_COMPOSE_DEFAULT: > + case V4L2_SEL_TGT_COMPOSE_BOUNDS: > + case V4L2_SEL_TGT_CROP_BOUNDS: > + case V4L2_SEL_TGT_CROP_DEFAULT: This can't be right: depending on s->type you either support compose or crop, I'm pretty sure you are not supporting both composing and cropping for both capture and output directions. What exactly is the functionality you attempt to implement here? I'm CC-ing Tomasz as well as I discussed the selection API for m2m devices with him during the LPC. > + s->r.left = 0; > + s->r.top = 0; > + s->r.width = frame->f_width; > + s->r.height = frame->f_height; > + return 0; > + > + case V4L2_SEL_TGT_COMPOSE: > + case V4L2_SEL_TGT_CROP: Ditto. > + s->r.left = frame->crop.left; > + s->r.top = frame->crop.top; > + s->r.width = frame->crop.width; > + s->r.height = frame->crop.height; > + return 0; > + } > + > + return -EINVAL; > +} > + > +static int scaler_m2m_s_selection(struct file *file, void *fh, > + struct v4l2_selection *s) > +{ > + struct scaler_frame *frame; > + struct scaler_ctx *ctx = fh_to_ctx(fh); > + struct v4l2_crop cr; > + struct scaler_variant *variant = ctx->scaler_dev->variant; > + int ret; > + > + cr.type = s->type; > + cr.c = s->r; > + > + if ((s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) && > + (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)) > + return -EINVAL; > + > + ret = scaler_try_crop(ctx, &cr); > + if (ret < 0) > + return ret; > + > + if (s->flags & V4L2_SEL_FLAG_LE && > + !is_rectangle_enclosed(&cr.c, &s->r)) > + return -ERANGE; > + > + if (s->flags & V4L2_SEL_FLAG_GE && > + !is_rectangle_enclosed(&s->r, &cr.c)) > + return -ERANGE; > + > + s->r = cr.c; > + > + switch (s->target) { > + case V4L2_SEL_TGT_COMPOSE_BOUNDS: > + case V4L2_SEL_TGT_COMPOSE_DEFAULT: > + case V4L2_SEL_TGT_COMPOSE: > + frame = &ctx->s_frame; > + break; > + > + case V4L2_SEL_TGT_CROP_BOUNDS: > + case V4L2_SEL_TGT_CROP: > + case V4L2_SEL_TGT_CROP_DEFAULT: > + frame = &ctx->d_frame; > + break; Similar problems as with g_selection above. Tomasz mentioned to me that the selection API is not implemented correctly in m2m Samsung drivers. It looks like this code is copied-and-pasted from other drivers, so it seems he was right. The selection API for m2m devices will be discussed during the upcoming V4L2 mini-summit since the API may actually need some adjustments to have it work the way it should. As requested above, if you can explain the exact functionality you are trying to implement here, then I can look over this code carefully and see how it should be done. Thanks! Hans > + > + default: > + return -EINVAL; > + } > + > + /* Check to see if scaling ratio is within supported range */ > + if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { > + ret = scaler_check_scaler_ratio(variant, cr.c.width, > + cr.c.height, ctx->d_frame.crop.width, > + ctx->d_frame.crop.height, > + ctx->ctrls_scaler.rotate->val); > + } else { > + ret = scaler_check_scaler_ratio(variant, > + ctx->s_frame.crop.width, > + ctx->s_frame.crop.height, cr.c.width, > + cr.c.height, ctx->ctrls_scaler.rotate->val); > + } > + > + if (ret < 0) { > + scaler_dbg(ctx->scaler_dev, "Out of scaler range"); > + return -EINVAL; > + } > + > + frame->crop = cr.c; > + > + scaler_ctx_state_lock_set(SCALER_PARAMS, ctx); > + return 0; > +} -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Hans, Thanks for pointing it out. On Mon, Sep 30, 2013 at 1:38 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote: > Hi Shaik, > > I have a few questions regarding the selection part... > > On 09/12/2013 03:09 PM, Shaik Ameer Basha wrote: >> This patch adds the Makefile and memory to memory (m2m) interface >> functionality for the SCALER driver. >> >> Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com> >> --- >> drivers/media/platform/Kconfig | 8 + >> drivers/media/platform/Makefile | 1 + >> drivers/media/platform/exynos-scaler/Makefile | 3 + >> drivers/media/platform/exynos-scaler/scaler-m2m.c | 781 +++++++++++++++++++++ >> 4 files changed, 793 insertions(+) >> create mode 100644 drivers/media/platform/exynos-scaler/Makefile >> create mode 100644 drivers/media/platform/exynos-scaler/scaler-m2m.c >> > [...] >> + >> +static int scaler_m2m_s_selection(struct file *file, void *fh, >> + struct v4l2_selection *s) >> +{ >> + struct scaler_frame *frame; >> + struct scaler_ctx *ctx = fh_to_ctx(fh); >> + struct v4l2_crop cr; >> + struct scaler_variant *variant = ctx->scaler_dev->variant; >> + int ret; >> + >> + cr.type = s->type; >> + cr.c = s->r; >> + >> + if ((s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) && >> + (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)) >> + return -EINVAL; >> + >> + ret = scaler_try_crop(ctx, &cr); >> + if (ret < 0) >> + return ret; >> + >> + if (s->flags & V4L2_SEL_FLAG_LE && >> + !is_rectangle_enclosed(&cr.c, &s->r)) >> + return -ERANGE; >> + >> + if (s->flags & V4L2_SEL_FLAG_GE && >> + !is_rectangle_enclosed(&s->r, &cr.c)) >> + return -ERANGE; >> + >> + s->r = cr.c; >> + >> + switch (s->target) { >> + case V4L2_SEL_TGT_COMPOSE_BOUNDS: >> + case V4L2_SEL_TGT_COMPOSE_DEFAULT: >> + case V4L2_SEL_TGT_COMPOSE: >> + frame = &ctx->s_frame; >> + break; >> + >> + case V4L2_SEL_TGT_CROP_BOUNDS: >> + case V4L2_SEL_TGT_CROP: >> + case V4L2_SEL_TGT_CROP_DEFAULT: >> + frame = &ctx->d_frame; >> + break; > > Similar problems as with g_selection above. Tomasz mentioned to me that the selection > API is not implemented correctly in m2m Samsung drivers. It looks like this code is > copied-and-pasted from other drivers, so it seems he was right. Sorry, after going through the documentation, I have to agree with you... As you mentioned, this part of the code was copied while implementing the G-Scaler driver :) I will change the above implementation for M2M devices (GScaler and SCALER) as below, I will only allow all V4L2_SEL_TGT_COMPOSE_* target requests if 's->type' is equal to "V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE". and all V4L2_SEL_TGT_CROP_* target requests if 's->type' is equal to "V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE". I hope with the above two checkings taken in to care, there should not be any issues with using selection APIs here. Thanks, Shaik Ameer Basha > > The selection API for m2m devices will be discussed during the upcoming V4L2 mini-summit > since the API may actually need some adjustments to have it work the way it should. > > As requested above, if you can explain the exact functionality you are trying to > implement here, then I can look over this code carefully and see how it should be done. > > Thanks! > > Hans > [...] -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/30/2013 11:32 AM, Shaik Ameer Basha wrote: > Hi Hans, > > Thanks for pointing it out. > > > On Mon, Sep 30, 2013 at 1:38 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote: >> Hi Shaik, >> >> I have a few questions regarding the selection part... >> >> On 09/12/2013 03:09 PM, Shaik Ameer Basha wrote: >>> This patch adds the Makefile and memory to memory (m2m) interface >>> functionality for the SCALER driver. >>> >>> Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com> >>> --- >>> drivers/media/platform/Kconfig | 8 + >>> drivers/media/platform/Makefile | 1 + >>> drivers/media/platform/exynos-scaler/Makefile | 3 + >>> drivers/media/platform/exynos-scaler/scaler-m2m.c | 781 +++++++++++++++++++++ >>> 4 files changed, 793 insertions(+) >>> create mode 100644 drivers/media/platform/exynos-scaler/Makefile >>> create mode 100644 drivers/media/platform/exynos-scaler/scaler-m2m.c >>> >> > > > [...] > > >>> + >>> +static int scaler_m2m_s_selection(struct file *file, void *fh, >>> + struct v4l2_selection *s) >>> +{ >>> + struct scaler_frame *frame; >>> + struct scaler_ctx *ctx = fh_to_ctx(fh); >>> + struct v4l2_crop cr; >>> + struct scaler_variant *variant = ctx->scaler_dev->variant; >>> + int ret; >>> + >>> + cr.type = s->type; >>> + cr.c = s->r; >>> + >>> + if ((s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) && >>> + (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)) >>> + return -EINVAL; >>> + >>> + ret = scaler_try_crop(ctx, &cr); >>> + if (ret < 0) >>> + return ret; >>> + >>> + if (s->flags & V4L2_SEL_FLAG_LE && >>> + !is_rectangle_enclosed(&cr.c, &s->r)) >>> + return -ERANGE; >>> + >>> + if (s->flags & V4L2_SEL_FLAG_GE && >>> + !is_rectangle_enclosed(&s->r, &cr.c)) >>> + return -ERANGE; >>> + >>> + s->r = cr.c; >>> + >>> + switch (s->target) { >>> + case V4L2_SEL_TGT_COMPOSE_BOUNDS: >>> + case V4L2_SEL_TGT_COMPOSE_DEFAULT: >>> + case V4L2_SEL_TGT_COMPOSE: >>> + frame = &ctx->s_frame; >>> + break; >>> + >>> + case V4L2_SEL_TGT_CROP_BOUNDS: >>> + case V4L2_SEL_TGT_CROP: >>> + case V4L2_SEL_TGT_CROP_DEFAULT: >>> + frame = &ctx->d_frame; >>> + break; >> >> Similar problems as with g_selection above. Tomasz mentioned to me that the selection >> API is not implemented correctly in m2m Samsung drivers. It looks like this code is >> copied-and-pasted from other drivers, so it seems he was right. > > Sorry, after going through the documentation, I have to agree with you... > As you mentioned, this part of the code was copied while implementing > the G-Scaler driver :) > > I will change the above implementation for M2M devices (GScaler and > SCALER) as below, > I will only allow all V4L2_SEL_TGT_COMPOSE_* target requests if > 's->type' is equal to "V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE". > and all V4L2_SEL_TGT_CROP_* target requests if 's->type' is equal to > "V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE". > > I hope with the above two checkings taken in to care, there should not > be any issues with using selection APIs here. Well, that depends on what the hardware does. Using compose with a capture buffer means that the frame as delivered by the hardware is composed into a larger buffer. E.g. the hardware gives you 1280x720 which is composed into a buffer of size 1920x1080. Using crop with an output buffer means that the hardware gets a cropped part of a larger frame. E.g. you give a 1280x720 crop from a larger 1920x1080 buffer. I suspect however, that in this case the hardware does the opposite for capture: you really want to crop with a capture buffer (e.g. the hardware delivers a 1280x720 frame which is cropped before DMA to 640x360). I'm not sure what you want to do with an output buffer: cropping or composing. Tomasz mentioned that the M2M + selection API was screwy, and this seems to be to be the case indeed. Which is also why I would like to know exactly what this hardware does. Regards, Hans > > Thanks, > Shaik Ameer Basha > >> >> The selection API for m2m devices will be discussed during the upcoming V4L2 mini-summit >> since the API may actually need some adjustments to have it work the way it should. >> >> As requested above, if you can explain the exact functionality you are trying to >> implement here, then I can look over this code carefully and see how it should be done. >> >> Thanks! >> >> Hans >> > [...] > -- > 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Hans, On Mon, Sep 30, 2013 at 4:02 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote: > On 09/30/2013 11:32 AM, Shaik Ameer Basha wrote: >> Hi Hans, >> >> Thanks for pointing it out. >> >> >> On Mon, Sep 30, 2013 at 1:38 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote: >>> Hi Shaik, >>> >>> I have a few questions regarding the selection part... >>> >>> On 09/12/2013 03:09 PM, Shaik Ameer Basha wrote: >>>> This patch adds the Makefile and memory to memory (m2m) interface >>>> functionality for the SCALER driver. >>>> >>>> Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com> >>>> --- >>>> drivers/media/platform/Kconfig | 8 + >>>> drivers/media/platform/Makefile | 1 + >>>> drivers/media/platform/exynos-scaler/Makefile | 3 + >>>> drivers/media/platform/exynos-scaler/scaler-m2m.c | 781 +++++++++++++++++++++ >>>> 4 files changed, 793 insertions(+) >>>> create mode 100644 drivers/media/platform/exynos-scaler/Makefile >>>> create mode 100644 drivers/media/platform/exynos-scaler/scaler-m2m.c >>>> >>> >> >> >> [...] >> >> >>>> + >>>> +static int scaler_m2m_s_selection(struct file *file, void *fh, >>>> + struct v4l2_selection *s) >>>> +{ >>>> + struct scaler_frame *frame; >>>> + struct scaler_ctx *ctx = fh_to_ctx(fh); >>>> + struct v4l2_crop cr; >>>> + struct scaler_variant *variant = ctx->scaler_dev->variant; >>>> + int ret; >>>> + >>>> + cr.type = s->type; >>>> + cr.c = s->r; >>>> + >>>> + if ((s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) && >>>> + (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)) >>>> + return -EINVAL; >>>> + >>>> + ret = scaler_try_crop(ctx, &cr); >>>> + if (ret < 0) >>>> + return ret; >>>> + >>>> + if (s->flags & V4L2_SEL_FLAG_LE && >>>> + !is_rectangle_enclosed(&cr.c, &s->r)) >>>> + return -ERANGE; >>>> + >>>> + if (s->flags & V4L2_SEL_FLAG_GE && >>>> + !is_rectangle_enclosed(&s->r, &cr.c)) >>>> + return -ERANGE; >>>> + >>>> + s->r = cr.c; >>>> + >>>> + switch (s->target) { >>>> + case V4L2_SEL_TGT_COMPOSE_BOUNDS: >>>> + case V4L2_SEL_TGT_COMPOSE_DEFAULT: >>>> + case V4L2_SEL_TGT_COMPOSE: >>>> + frame = &ctx->s_frame; >>>> + break; >>>> + >>>> + case V4L2_SEL_TGT_CROP_BOUNDS: >>>> + case V4L2_SEL_TGT_CROP: >>>> + case V4L2_SEL_TGT_CROP_DEFAULT: >>>> + frame = &ctx->d_frame; >>>> + break; >>> >>> Similar problems as with g_selection above. Tomasz mentioned to me that the selection >>> API is not implemented correctly in m2m Samsung drivers. It looks like this code is >>> copied-and-pasted from other drivers, so it seems he was right. >> >> Sorry, after going through the documentation, I have to agree with you... >> As you mentioned, this part of the code was copied while implementing >> the G-Scaler driver :) >> >> I will change the above implementation for M2M devices (GScaler and >> SCALER) as below, >> I will only allow all V4L2_SEL_TGT_COMPOSE_* target requests if >> 's->type' is equal to "V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE". >> and all V4L2_SEL_TGT_CROP_* target requests if 's->type' is equal to >> "V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE". >> >> I hope with the above two checkings taken in to care, there should not >> be any issues with using selection APIs here. > > Well, that depends on what the hardware does. > > Using compose with a capture buffer means that the frame as delivered by > the hardware is composed into a larger buffer. E.g. the hardware gives > you 1280x720 which is composed into a buffer of size 1920x1080. > > Using crop with an output buffer means that the hardware gets a cropped > part of a larger frame. E.g. you give a 1280x720 crop from a larger 1920x1080 > buffer. > > I suspect however, that in this case the hardware does the opposite for > capture: you really want to crop with a capture buffer (e.g. the hardware > delivers a 1280x720 frame which is cropped before DMA to 640x360). > > I'm not sure what you want to do with an output buffer: cropping or composing. > > Tomasz mentioned that the M2M + selection API was screwy, and this seems to > be to be the case indeed. > > Which is also why I would like to know exactly what this hardware does. This hardware is just a M2M device. It accepts one source buffer at a time and does some operations on that and saves to the destination buffer. Operations like Rotation, Cropping, Scaling, Color Space Conversion etc are possible. Here when I provide the Output buffer (source buffer), I can apply all V4L2_SEL_TGT_CROP_* targets on it. That means I can select the whole buffer for processing or apply some crop and select that area for further processing. similarly, On the capture buffer (output buffer), I can apply V4L2_SEL_TGT_COMPOSE_* targets. That means I can compose the final output to the complete capture frame (dst frame), or I can choose some part of the destination frame. Regards, Shaik Ameer Basha > > Regards, > > Hans > >> >> Thanks, >> Shaik Ameer Basha >> >>> >>> The selection API for m2m devices will be discussed during the upcoming V4L2 mini-summit >>> since the API may actually need some adjustments to have it work the way it should. >>> >>> As requested above, if you can explain the exact functionality you are trying to >>> implement here, then I can look over this code carefully and see how it should be done. >>> >>> Thanks! >>> >>> Hans >>> >> [...] >> -- >> 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 >> > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Sep 30, 2013 at 4:18 PM, Shaik Ameer Basha <shaik.samsung@gmail.com> wrote: > Hi Hans, > > > On Mon, Sep 30, 2013 at 4:02 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote: >> On 09/30/2013 11:32 AM, Shaik Ameer Basha wrote: >>> Hi Hans, >>> >>> Thanks for pointing it out. >>> >>> >>> On Mon, Sep 30, 2013 at 1:38 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote: >>>> Hi Shaik, >>>> >>>> I have a few questions regarding the selection part... >>>> >>>> On 09/12/2013 03:09 PM, Shaik Ameer Basha wrote: >>>>> This patch adds the Makefile and memory to memory (m2m) interface >>>>> functionality for the SCALER driver. >>>>> >>>>> Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com> >>>>> --- >>>>> drivers/media/platform/Kconfig | 8 + >>>>> drivers/media/platform/Makefile | 1 + >>>>> drivers/media/platform/exynos-scaler/Makefile | 3 + >>>>> drivers/media/platform/exynos-scaler/scaler-m2m.c | 781 +++++++++++++++++++++ >>>>> 4 files changed, 793 insertions(+) >>>>> create mode 100644 drivers/media/platform/exynos-scaler/Makefile >>>>> create mode 100644 drivers/media/platform/exynos-scaler/scaler-m2m.c >>>>> >>>> >>> >>> >>> [...] >>> >>> >>>>> + >>>>> +static int scaler_m2m_s_selection(struct file *file, void *fh, >>>>> + struct v4l2_selection *s) >>>>> +{ >>>>> + struct scaler_frame *frame; >>>>> + struct scaler_ctx *ctx = fh_to_ctx(fh); >>>>> + struct v4l2_crop cr; >>>>> + struct scaler_variant *variant = ctx->scaler_dev->variant; >>>>> + int ret; >>>>> + >>>>> + cr.type = s->type; >>>>> + cr.c = s->r; >>>>> + >>>>> + if ((s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) && >>>>> + (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)) >>>>> + return -EINVAL; >>>>> + >>>>> + ret = scaler_try_crop(ctx, &cr); >>>>> + if (ret < 0) >>>>> + return ret; >>>>> + >>>>> + if (s->flags & V4L2_SEL_FLAG_LE && >>>>> + !is_rectangle_enclosed(&cr.c, &s->r)) >>>>> + return -ERANGE; >>>>> + >>>>> + if (s->flags & V4L2_SEL_FLAG_GE && >>>>> + !is_rectangle_enclosed(&s->r, &cr.c)) >>>>> + return -ERANGE; >>>>> + >>>>> + s->r = cr.c; >>>>> + >>>>> + switch (s->target) { >>>>> + case V4L2_SEL_TGT_COMPOSE_BOUNDS: >>>>> + case V4L2_SEL_TGT_COMPOSE_DEFAULT: >>>>> + case V4L2_SEL_TGT_COMPOSE: >>>>> + frame = &ctx->s_frame; >>>>> + break; >>>>> + >>>>> + case V4L2_SEL_TGT_CROP_BOUNDS: >>>>> + case V4L2_SEL_TGT_CROP: >>>>> + case V4L2_SEL_TGT_CROP_DEFAULT: >>>>> + frame = &ctx->d_frame; >>>>> + break; >>>> >>>> Similar problems as with g_selection above. Tomasz mentioned to me that the selection >>>> API is not implemented correctly in m2m Samsung drivers. It looks like this code is >>>> copied-and-pasted from other drivers, so it seems he was right. >>> >>> Sorry, after going through the documentation, I have to agree with you... >>> As you mentioned, this part of the code was copied while implementing >>> the G-Scaler driver :) >>> >>> I will change the above implementation for M2M devices (GScaler and >>> SCALER) as below, >>> I will only allow all V4L2_SEL_TGT_COMPOSE_* target requests if >>> 's->type' is equal to "V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE". >>> and all V4L2_SEL_TGT_CROP_* target requests if 's->type' is equal to >>> "V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE". >>> >>> I hope with the above two checkings taken in to care, there should not >>> be any issues with using selection APIs here. >> >> Well, that depends on what the hardware does. >> >> Using compose with a capture buffer means that the frame as delivered by >> the hardware is composed into a larger buffer. E.g. the hardware gives >> you 1280x720 which is composed into a buffer of size 1920x1080. >> >> Using crop with an output buffer means that the hardware gets a cropped >> part of a larger frame. E.g. you give a 1280x720 crop from a larger 1920x1080 >> buffer. >> >> I suspect however, that in this case the hardware does the opposite for >> capture: you really want to crop with a capture buffer (e.g. the hardware >> delivers a 1280x720 frame which is cropped before DMA to 640x360). >> >> I'm not sure what you want to do with an output buffer: cropping or composing. >> >> Tomasz mentioned that the M2M + selection API was screwy, and this seems to >> be to be the case indeed. >> >> Which is also why I would like to know exactly what this hardware does. > > This hardware is just a M2M device. > It accepts one source buffer at a time and does some operations on > that and saves to the destination buffer. > Operations like Rotation, Cropping, Scaling, Color Space Conversion > etc are possible. > > Here when I provide the Output buffer (source buffer), I can apply all > V4L2_SEL_TGT_CROP_* targets on it. > That means I can select the whole buffer for processing or apply some > crop and select that area for further processing. > > similarly, On the capture buffer (output buffer), I can apply similarly, On the capture buffer (destination buffer), I can apply > V4L2_SEL_TGT_COMPOSE_* targets. > That means I can compose the final output to the complete capture > frame (dst frame), or I can choose some part of the destination frame. > > Regards, > Shaik Ameer Basha > > >> >> Regards, >> >> Hans >> >>> >>> Thanks, >>> Shaik Ameer Basha >>> >>>> >>>> The selection API for m2m devices will be discussed during the upcoming V4L2 mini-summit >>>> since the API may actually need some adjustments to have it work the way it should. >>>> >>>> As requested above, if you can explain the exact functionality you are trying to >>>> implement here, then I can look over this code carefully and see how it should be done. >>>> >>>> Thanks! >>>> >>>> Hans >>>> >>> [...] >>> -- >>> 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 >>> >> -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/30/2013 12:48 PM, Shaik Ameer Basha wrote: > Hi Hans, > > > On Mon, Sep 30, 2013 at 4:02 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote: >> On 09/30/2013 11:32 AM, Shaik Ameer Basha wrote: >>> Hi Hans, >>> >>> Thanks for pointing it out. >>> >>> >>> On Mon, Sep 30, 2013 at 1:38 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote: >>>> Hi Shaik, >>>> >>>> I have a few questions regarding the selection part... >>>> >>>> On 09/12/2013 03:09 PM, Shaik Ameer Basha wrote: >>>>> This patch adds the Makefile and memory to memory (m2m) interface >>>>> functionality for the SCALER driver. >>>>> >>>>> Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com> >>>>> --- >>>>> drivers/media/platform/Kconfig | 8 + >>>>> drivers/media/platform/Makefile | 1 + >>>>> drivers/media/platform/exynos-scaler/Makefile | 3 + >>>>> drivers/media/platform/exynos-scaler/scaler-m2m.c | 781 +++++++++++++++++++++ >>>>> 4 files changed, 793 insertions(+) >>>>> create mode 100644 drivers/media/platform/exynos-scaler/Makefile >>>>> create mode 100644 drivers/media/platform/exynos-scaler/scaler-m2m.c >>>>> >>>> >>> >>> >>> [...] >>> >>> >>>>> + >>>>> +static int scaler_m2m_s_selection(struct file *file, void *fh, >>>>> + struct v4l2_selection *s) >>>>> +{ >>>>> + struct scaler_frame *frame; >>>>> + struct scaler_ctx *ctx = fh_to_ctx(fh); >>>>> + struct v4l2_crop cr; >>>>> + struct scaler_variant *variant = ctx->scaler_dev->variant; >>>>> + int ret; >>>>> + >>>>> + cr.type = s->type; >>>>> + cr.c = s->r; >>>>> + >>>>> + if ((s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) && >>>>> + (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)) >>>>> + return -EINVAL; >>>>> + >>>>> + ret = scaler_try_crop(ctx, &cr); >>>>> + if (ret < 0) >>>>> + return ret; >>>>> + >>>>> + if (s->flags & V4L2_SEL_FLAG_LE && >>>>> + !is_rectangle_enclosed(&cr.c, &s->r)) >>>>> + return -ERANGE; >>>>> + >>>>> + if (s->flags & V4L2_SEL_FLAG_GE && >>>>> + !is_rectangle_enclosed(&s->r, &cr.c)) >>>>> + return -ERANGE; >>>>> + >>>>> + s->r = cr.c; >>>>> + >>>>> + switch (s->target) { >>>>> + case V4L2_SEL_TGT_COMPOSE_BOUNDS: >>>>> + case V4L2_SEL_TGT_COMPOSE_DEFAULT: >>>>> + case V4L2_SEL_TGT_COMPOSE: >>>>> + frame = &ctx->s_frame; >>>>> + break; >>>>> + >>>>> + case V4L2_SEL_TGT_CROP_BOUNDS: >>>>> + case V4L2_SEL_TGT_CROP: >>>>> + case V4L2_SEL_TGT_CROP_DEFAULT: >>>>> + frame = &ctx->d_frame; >>>>> + break; >>>> >>>> Similar problems as with g_selection above. Tomasz mentioned to me that the selection >>>> API is not implemented correctly in m2m Samsung drivers. It looks like this code is >>>> copied-and-pasted from other drivers, so it seems he was right. >>> >>> Sorry, after going through the documentation, I have to agree with you... >>> As you mentioned, this part of the code was copied while implementing >>> the G-Scaler driver :) >>> >>> I will change the above implementation for M2M devices (GScaler and >>> SCALER) as below, >>> I will only allow all V4L2_SEL_TGT_COMPOSE_* target requests if >>> 's->type' is equal to "V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE". >>> and all V4L2_SEL_TGT_CROP_* target requests if 's->type' is equal to >>> "V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE". >>> >>> I hope with the above two checkings taken in to care, there should not >>> be any issues with using selection APIs here. >> >> Well, that depends on what the hardware does. >> >> Using compose with a capture buffer means that the frame as delivered by >> the hardware is composed into a larger buffer. E.g. the hardware gives >> you 1280x720 which is composed into a buffer of size 1920x1080. >> >> Using crop with an output buffer means that the hardware gets a cropped >> part of a larger frame. E.g. you give a 1280x720 crop from a larger 1920x1080 >> buffer. >> >> I suspect however, that in this case the hardware does the opposite for >> capture: you really want to crop with a capture buffer (e.g. the hardware >> delivers a 1280x720 frame which is cropped before DMA to 640x360). >> >> I'm not sure what you want to do with an output buffer: cropping or composing. >> >> Tomasz mentioned that the M2M + selection API was screwy, and this seems to >> be to be the case indeed. >> >> Which is also why I would like to know exactly what this hardware does. > > This hardware is just a M2M device. > It accepts one source buffer at a time and does some operations on > that and saves to the destination buffer. > Operations like Rotation, Cropping, Scaling, Color Space Conversion > etc are possible. > > Here when I provide the Output buffer (source buffer), I can apply all > V4L2_SEL_TGT_CROP_* targets on it. > That means I can select the whole buffer for processing or apply some > crop and select that area for further processing. > > similarly, On the capture buffer (output buffer), I can apply > V4L2_SEL_TGT_COMPOSE_* targets. > That means I can compose the final output to the complete capture > frame (dst frame), or I can choose some part of the destination frame. OK, in that case your proposed changes are indeed correct. Sorry, I had to check this carefully since it is so easy to get confused :-) Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" 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/Kconfig b/drivers/media/platform/Kconfig index 8068d7b..339d3ba 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -201,6 +201,14 @@ config VIDEO_SAMSUNG_EXYNOS_GSC help This is a v4l2 driver for Samsung EXYNOS5 SoC G-Scaler. +config VIDEO_SAMSUNG_EXYNOS_SCALER + tristate "Samsung Exynos SCALER driver" + depends on OF && VIDEO_DEV && VIDEO_V4L2 && ARCH_EXYNOS5 + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + This is a v4l2 driver for Samsung EXYNOS5410/5420 SoC SCALER. + config VIDEO_SH_VEU tristate "SuperH VEU mem2mem video processing driver" depends on VIDEO_DEV && VIDEO_V4L2 && GENERIC_HARDIRQS && HAS_DMA diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 4e4da48..14cdad5 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -37,6 +37,7 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV) += s5p-tv/ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) += s5p-g2d/ obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ +obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_SCALER) += exynos-scaler/ obj-$(CONFIG_BLACKFIN) += blackfin/ diff --git a/drivers/media/platform/exynos-scaler/Makefile b/drivers/media/platform/exynos-scaler/Makefile new file mode 100644 index 0000000..6c8a25b --- /dev/null +++ b/drivers/media/platform/exynos-scaler/Makefile @@ -0,0 +1,3 @@ +exynos-scaler-objs := scaler.o scaler-m2m.o scaler-regs.o + +obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_SCALER) += exynos-scaler.o diff --git a/drivers/media/platform/exynos-scaler/scaler-m2m.c b/drivers/media/platform/exynos-scaler/scaler-m2m.c new file mode 100644 index 0000000..eb32f2f --- /dev/null +++ b/drivers/media/platform/exynos-scaler/scaler-m2m.c @@ -0,0 +1,781 @@ +/* + * Copyright (c) 2013 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * + * Samsung EXYNOS5 SoC series SCALER driver + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/module.h> +#include <linux/pm_runtime.h> + +#include <media/v4l2-ioctl.h> + +#include "scaler-regs.h" + +#define SCALER_DEF_PIX_FMT V4L2_PIX_FMT_RGB32 +#define SCALER_DEF_WIDTH 1280 +#define SCALER_DEF_HEIGHT 720 + +static int scaler_m2m_ctx_stop_req(struct scaler_ctx *ctx) +{ + struct scaler_ctx *curr_ctx; + struct scaler_dev *scaler = ctx->scaler_dev; + int ret; + + curr_ctx = v4l2_m2m_get_curr_priv(scaler->m2m.m2m_dev); + if (!scaler_m2m_pending(scaler) || (curr_ctx != ctx)) + return 0; + + scaler_ctx_state_lock_set(SCALER_CTX_STOP_REQ, ctx); + ret = wait_event_timeout(scaler->irq_queue, + !scaler_ctx_state_is_set(SCALER_CTX_STOP_REQ, ctx), + SCALER_SHUTDOWN_TIMEOUT); + + return ret == 0 ? -ETIMEDOUT : ret; +} + +static int scaler_m2m_start_streaming(struct vb2_queue *q, unsigned int count) +{ + struct scaler_ctx *ctx = q->drv_priv; + int ret; + + ret = pm_runtime_get_sync(&ctx->scaler_dev->pdev->dev); + + return ret > 0 ? 0 : ret; +} + +static int scaler_m2m_stop_streaming(struct vb2_queue *q) +{ + struct scaler_ctx *ctx = q->drv_priv; + int ret; + + ret = scaler_m2m_ctx_stop_req(ctx); + if (ret < 0) + scaler_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR); + + pm_runtime_put(&ctx->scaler_dev->pdev->dev); + + return 0; +} + +void scaler_m2m_job_finish(struct scaler_ctx *ctx, int vb_state) +{ + struct vb2_buffer *src_vb, *dst_vb; + + if (!ctx || !ctx->m2m_ctx) + return; + + src_vb = v4l2_m2m_src_buf_remove(ctx->m2m_ctx); + dst_vb = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx); + + if (src_vb && dst_vb) { + v4l2_m2m_buf_done(src_vb, vb_state); + v4l2_m2m_buf_done(dst_vb, vb_state); + + v4l2_m2m_job_finish(ctx->scaler_dev->m2m.m2m_dev, + ctx->m2m_ctx); + } +} + +static void scaler_m2m_job_abort(void *priv) +{ + struct scaler_ctx *ctx = priv; + int ret; + + ret = scaler_m2m_ctx_stop_req(ctx); + if (ret < 0) + scaler_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR); +} + +static int scaler_get_bufs(struct scaler_ctx *ctx) +{ + struct scaler_frame *s_frame, *d_frame; + struct vb2_buffer *src_vb, *dst_vb; + int ret; + + s_frame = &ctx->s_frame; + d_frame = &ctx->d_frame; + + src_vb = v4l2_m2m_next_src_buf(ctx->m2m_ctx); + ret = scaler_prepare_addr(ctx, src_vb, s_frame, &s_frame->addr); + if (ret < 0) + return ret; + + dst_vb = v4l2_m2m_next_dst_buf(ctx->m2m_ctx); + ret = scaler_prepare_addr(ctx, dst_vb, d_frame, &d_frame->addr); + if (ret < 0) + return ret; + + dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp; + + return 0; +} + +static void scaler_m2m_device_run(void *priv) +{ + struct scaler_ctx *ctx = priv; + struct scaler_dev *scaler; + unsigned long flags; + int ret; + bool is_stopped; + + if (WARN(!ctx, "Null hardware context\n")) + return; + + scaler = ctx->scaler_dev; + spin_lock_irqsave(&scaler->slock, flags); + + set_bit(ST_M2M_PEND, &scaler->state); + + /* Reconfigure hardware if the context has changed. */ + if (scaler->m2m.ctx != ctx) { + scaler_dbg(scaler, "scaler->m2m.ctx = 0x%p, current_ctx = 0x%p", + scaler->m2m.ctx, ctx); + ctx->state |= SCALER_PARAMS; + scaler->m2m.ctx = ctx; + } + + is_stopped = ctx->state & SCALER_CTX_STOP_REQ; + ctx->state &= ~SCALER_CTX_STOP_REQ; + if (is_stopped) { + wake_up(&scaler->irq_queue); + goto unlock; + } + + ret = scaler_get_bufs(ctx); + if (ret < 0) { + scaler_dbg(scaler, "Wrong address\n"); + goto unlock; + } + + scaler_hw_address_queue_reset(ctx); + scaler_set_prefbuf(scaler, &ctx->s_frame); + scaler_hw_set_input_addr(scaler, &ctx->s_frame.addr); + scaler_hw_set_output_addr(scaler, &ctx->d_frame.addr); + scaler_hw_set_csc_coeff(ctx); + + if (ctx->state & SCALER_PARAMS) { + scaler_hw_set_irq(scaler, SCALER_INT_FRAME_END, false); + if (scaler_set_scaler_info(ctx)) { + scaler_dbg(scaler, "Scaler setup error"); + goto unlock; + } + + scaler_hw_set_in_size(ctx); + scaler_hw_set_in_image_format(ctx); + + scaler_hw_set_out_size(ctx); + scaler_hw_set_out_image_format(ctx); + + scaler_hw_set_scaler_ratio(ctx); + scaler_hw_set_rotation(ctx); + } + + ctx->state &= ~SCALER_PARAMS; + scaler_hw_enable_control(scaler, true); + + spin_unlock_irqrestore(&scaler->slock, flags); + return; + +unlock: + ctx->state &= ~SCALER_PARAMS; + spin_unlock_irqrestore(&scaler->slock, flags); +} + +static int scaler_m2m_queue_setup(struct vb2_queue *vq, + const struct v4l2_format *fmt, + unsigned int *num_buffers, unsigned int *num_planes, + unsigned int sizes[], void *allocators[]) +{ + struct scaler_ctx *ctx = vb2_get_drv_priv(vq); + struct scaler_frame *frame; + int i; + + frame = ctx_get_frame(ctx, vq->type); + if (IS_ERR(frame)) + return PTR_ERR(frame); + + if (!frame->fmt) + return -EINVAL; + + *num_planes = frame->fmt->num_planes; + for (i = 0; i < frame->fmt->num_planes; i++) { + sizes[i] = frame->payload[i]; + allocators[i] = ctx->scaler_dev->alloc_ctx; + } + return 0; +} + +static int scaler_m2m_buf_prepare(struct vb2_buffer *vb) +{ + struct scaler_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); + struct scaler_frame *frame; + int i; + + frame = ctx_get_frame(ctx, vb->vb2_queue->type); + if (IS_ERR(frame)) + return PTR_ERR(frame); + + for (i = 0; i < frame->fmt->num_planes; i++) + vb2_set_plane_payload(vb, i, frame->payload[i]); + + return 0; +} + +static void scaler_m2m_buf_queue(struct vb2_buffer *vb) +{ + struct scaler_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); + + scaler_dbg(ctx->scaler_dev, "ctx: %p, ctx->state: 0x%x", + ctx, ctx->state); + + if (ctx->m2m_ctx) + v4l2_m2m_buf_queue(ctx->m2m_ctx, vb); +} + +static void scaler_lock(struct vb2_queue *vq) +{ + struct scaler_ctx *ctx = vb2_get_drv_priv(vq); + mutex_lock(&ctx->scaler_dev->lock); +} + +static void scaler_unlock(struct vb2_queue *vq) +{ + struct scaler_ctx *ctx = vb2_get_drv_priv(vq); + mutex_unlock(&ctx->scaler_dev->lock); +} + +static struct vb2_ops scaler_m2m_qops = { + .queue_setup = scaler_m2m_queue_setup, + .buf_prepare = scaler_m2m_buf_prepare, + .buf_queue = scaler_m2m_buf_queue, + .wait_prepare = scaler_unlock, + .wait_finish = scaler_lock, + .stop_streaming = scaler_m2m_stop_streaming, + .start_streaming = scaler_m2m_start_streaming, +}; + +static int scaler_m2m_querycap(struct file *file, void *fh, + struct v4l2_capability *cap) +{ + struct scaler_ctx *ctx = fh_to_ctx(fh); + struct scaler_dev *scaler = ctx->scaler_dev; + + cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M_MPLANE; + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; + + strlcpy(cap->driver, scaler->pdev->name, sizeof(cap->driver)); + strlcpy(cap->card, scaler->pdev->name, sizeof(cap->card)); + strlcpy(cap->bus_info, "platform:exynos5-scaler", + sizeof(cap->bus_info)); + + return 0; +} + +static int scaler_m2m_enum_fmt_mplane(struct file *file, void *priv, + struct v4l2_fmtdesc *f) +{ + return scaler_enum_fmt_mplane(f); +} + +static int scaler_m2m_g_fmt_mplane(struct file *file, void *fh, + struct v4l2_format *f) +{ + struct scaler_ctx *ctx = fh_to_ctx(fh); + + return scaler_g_fmt_mplane(ctx, f); +} + +static int scaler_m2m_try_fmt_mplane(struct file *file, void *fh, + struct v4l2_format *f) +{ + struct scaler_ctx *ctx = fh_to_ctx(fh); + + return scaler_try_fmt_mplane(ctx, f); +} + +static int scaler_m2m_set_default_format(struct scaler_ctx *ctx) +{ + struct scaler_frame *frame; + u32 def_pixformat = SCALER_DEF_PIX_FMT; + int i; + + frame = &ctx->s_frame; + + frame->colorspace = V4L2_COLORSPACE_REC709; + frame->fmt = scaler_find_fmt(&def_pixformat, NULL, 0); + if (!frame->fmt) + return -EINVAL; + + scaler_set_frame_size(frame, SCALER_DEF_WIDTH, SCALER_DEF_HEIGHT); + for (i = 0; i < frame->fmt->num_planes; i++) + frame->payload[i] = SCALER_DEF_WIDTH * SCALER_DEF_HEIGHT * + (frame->fmt->depth[i] / 8); + + scaler_ctx_state_lock_set(SCALER_PARAMS, ctx); + + /* Apply the same src frame settings to dst frame */ + ctx->d_frame = ctx->s_frame; + + return 0; +} + + +static int scaler_m2m_s_fmt_mplane(struct file *file, void *fh, + struct v4l2_format *f) +{ + struct scaler_ctx *ctx = fh_to_ctx(fh); + struct vb2_queue *vq; + struct scaler_frame *frame; + struct v4l2_pix_format_mplane *pix; + int i, ret = 0; + + ret = scaler_m2m_try_fmt_mplane(file, fh, f); + if (ret < 0) + return ret; + + vq = v4l2_m2m_get_vq(ctx->m2m_ctx, f->type); + + if (vb2_is_streaming(vq)) { + scaler_dbg(ctx->scaler_dev, "queue (%d) busy", f->type); + return -EBUSY; + } + + if (V4L2_TYPE_IS_OUTPUT(f->type)) + frame = &ctx->s_frame; + else + frame = &ctx->d_frame; + + pix = &f->fmt.pix_mp; + frame->colorspace = pix->colorspace; + frame->fmt = scaler_find_fmt(&pix->pixelformat, NULL, 0); + if (!frame->fmt) + return -EINVAL; + + for (i = 0; i < frame->fmt->num_planes; i++) + frame->payload[i] = pix->plane_fmt[i].sizeimage; + + scaler_set_frame_size(frame, pix->width, pix->height); + scaler_ctx_state_lock_set(SCALER_PARAMS, ctx); + + scaler_dbg(ctx->scaler_dev, "f_w: %d, f_h: %d", + frame->f_width, frame->f_height); + + return 0; +} + +static int scaler_m2m_reqbufs(struct file *file, void *fh, + struct v4l2_requestbuffers *reqbufs) +{ + struct scaler_ctx *ctx = fh_to_ctx(fh); + struct scaler_dev *scaler = ctx->scaler_dev; + u32 max_cnt; + + if (reqbufs->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) + max_cnt = scaler->variant->in_buf_cnt; + else + max_cnt = scaler->variant->out_buf_cnt; + + if (reqbufs->count > max_cnt) { + /* Adjust the count value as per driver supports */ + reqbufs->count = max_cnt; + } + + return v4l2_m2m_reqbufs(file, ctx->m2m_ctx, reqbufs); +} + +static int scaler_m2m_expbuf(struct file *file, void *fh, + struct v4l2_exportbuffer *eb) +{ + struct scaler_ctx *ctx = fh_to_ctx(fh); + return v4l2_m2m_expbuf(file, ctx->m2m_ctx, eb); +} + +static int scaler_m2m_querybuf(struct file *file, void *fh, + struct v4l2_buffer *buf) +{ + struct scaler_ctx *ctx = fh_to_ctx(fh); + return v4l2_m2m_querybuf(file, ctx->m2m_ctx, buf); +} + +static int scaler_m2m_qbuf(struct file *file, void *fh, + struct v4l2_buffer *buf) +{ + struct scaler_ctx *ctx = fh_to_ctx(fh); + return v4l2_m2m_qbuf(file, ctx->m2m_ctx, buf); +} + +static int scaler_m2m_dqbuf(struct file *file, void *fh, + struct v4l2_buffer *buf) +{ + struct scaler_ctx *ctx = fh_to_ctx(fh); + return v4l2_m2m_dqbuf(file, ctx->m2m_ctx, buf); +} + +static int scaler_m2m_streamon(struct file *file, void *fh, + enum v4l2_buf_type type) +{ + struct scaler_ctx *ctx = fh_to_ctx(fh); + return v4l2_m2m_streamon(file, ctx->m2m_ctx, type); +} + +static int scaler_m2m_streamoff(struct file *file, void *fh, + enum v4l2_buf_type type) +{ + struct scaler_ctx *ctx = fh_to_ctx(fh); + return v4l2_m2m_streamoff(file, ctx->m2m_ctx, type); +} + +/* Return 1 if rectangle a is enclosed in rectangle b, or 0 otherwise. */ +static int is_rectangle_enclosed(struct v4l2_rect *a, struct v4l2_rect *b) +{ + return !((a->left < b->left) || + (a->top < b->top) || + (a->left + a->width > b->left + b->width) || + (a->top + a->height > b->top + b->height)); +} + +static int scaler_m2m_g_selection(struct file *file, void *fh, + struct v4l2_selection *s) +{ + struct scaler_frame *frame; + struct scaler_ctx *ctx = fh_to_ctx(fh); + + if ((s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) && + (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)) + return -EINVAL; + + frame = ctx_get_frame(ctx, s->type); + if (IS_ERR(frame)) + return PTR_ERR(frame); + + switch (s->target) { + case V4L2_SEL_TGT_COMPOSE_DEFAULT: + case V4L2_SEL_TGT_COMPOSE_BOUNDS: + case V4L2_SEL_TGT_CROP_BOUNDS: + case V4L2_SEL_TGT_CROP_DEFAULT: + s->r.left = 0; + s->r.top = 0; + s->r.width = frame->f_width; + s->r.height = frame->f_height; + return 0; + + case V4L2_SEL_TGT_COMPOSE: + case V4L2_SEL_TGT_CROP: + s->r.left = frame->crop.left; + s->r.top = frame->crop.top; + s->r.width = frame->crop.width; + s->r.height = frame->crop.height; + return 0; + } + + return -EINVAL; +} + +static int scaler_m2m_s_selection(struct file *file, void *fh, + struct v4l2_selection *s) +{ + struct scaler_frame *frame; + struct scaler_ctx *ctx = fh_to_ctx(fh); + struct v4l2_crop cr; + struct scaler_variant *variant = ctx->scaler_dev->variant; + int ret; + + cr.type = s->type; + cr.c = s->r; + + if ((s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) && + (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)) + return -EINVAL; + + ret = scaler_try_crop(ctx, &cr); + if (ret < 0) + return ret; + + if (s->flags & V4L2_SEL_FLAG_LE && + !is_rectangle_enclosed(&cr.c, &s->r)) + return -ERANGE; + + if (s->flags & V4L2_SEL_FLAG_GE && + !is_rectangle_enclosed(&s->r, &cr.c)) + return -ERANGE; + + s->r = cr.c; + + switch (s->target) { + case V4L2_SEL_TGT_COMPOSE_BOUNDS: + case V4L2_SEL_TGT_COMPOSE_DEFAULT: + case V4L2_SEL_TGT_COMPOSE: + frame = &ctx->s_frame; + break; + + case V4L2_SEL_TGT_CROP_BOUNDS: + case V4L2_SEL_TGT_CROP: + case V4L2_SEL_TGT_CROP_DEFAULT: + frame = &ctx->d_frame; + break; + + default: + return -EINVAL; + } + + /* Check to see if scaling ratio is within supported range */ + if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { + ret = scaler_check_scaler_ratio(variant, cr.c.width, + cr.c.height, ctx->d_frame.crop.width, + ctx->d_frame.crop.height, + ctx->ctrls_scaler.rotate->val); + } else { + ret = scaler_check_scaler_ratio(variant, + ctx->s_frame.crop.width, + ctx->s_frame.crop.height, cr.c.width, + cr.c.height, ctx->ctrls_scaler.rotate->val); + } + + if (ret < 0) { + scaler_dbg(ctx->scaler_dev, "Out of scaler range"); + return -EINVAL; + } + + frame->crop = cr.c; + + scaler_ctx_state_lock_set(SCALER_PARAMS, ctx); + return 0; +} + +static const struct v4l2_ioctl_ops scaler_m2m_ioctl_ops = { + .vidioc_querycap = scaler_m2m_querycap, + .vidioc_enum_fmt_vid_cap_mplane = scaler_m2m_enum_fmt_mplane, + .vidioc_enum_fmt_vid_out_mplane = scaler_m2m_enum_fmt_mplane, + .vidioc_g_fmt_vid_cap_mplane = scaler_m2m_g_fmt_mplane, + .vidioc_g_fmt_vid_out_mplane = scaler_m2m_g_fmt_mplane, + .vidioc_try_fmt_vid_cap_mplane = scaler_m2m_try_fmt_mplane, + .vidioc_try_fmt_vid_out_mplane = scaler_m2m_try_fmt_mplane, + .vidioc_s_fmt_vid_cap_mplane = scaler_m2m_s_fmt_mplane, + .vidioc_s_fmt_vid_out_mplane = scaler_m2m_s_fmt_mplane, + .vidioc_reqbufs = scaler_m2m_reqbufs, + .vidioc_expbuf = scaler_m2m_expbuf, + .vidioc_querybuf = scaler_m2m_querybuf, + .vidioc_qbuf = scaler_m2m_qbuf, + .vidioc_dqbuf = scaler_m2m_dqbuf, + .vidioc_streamon = scaler_m2m_streamon, + .vidioc_streamoff = scaler_m2m_streamoff, + .vidioc_g_selection = scaler_m2m_g_selection, + .vidioc_s_selection = scaler_m2m_s_selection +}; + +static int queue_init(void *priv, struct vb2_queue *src_vq, + struct vb2_queue *dst_vq) +{ + struct scaler_ctx *ctx = priv; + int ret; + + memset(src_vq, 0, sizeof(*src_vq)); + src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; + src_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; + src_vq->drv_priv = ctx; + src_vq->ops = &scaler_m2m_qops; + src_vq->mem_ops = &vb2_dma_contig_memops; + src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); + + ret = vb2_queue_init(src_vq); + if (ret < 0) + return ret; + + memset(dst_vq, 0, sizeof(*dst_vq)); + dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; + dst_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; + dst_vq->drv_priv = ctx; + dst_vq->ops = &scaler_m2m_qops; + dst_vq->mem_ops = &vb2_dma_contig_memops; + dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); + + return vb2_queue_init(dst_vq); +} + +static int scaler_m2m_open(struct file *file) +{ + struct scaler_dev *scaler = video_drvdata(file); + struct scaler_ctx *ctx = NULL; + int ret; + + scaler_dbg(scaler, "pid: %d, state: 0x%lx", + task_pid_nr(current), scaler->state); + + if (mutex_lock_interruptible(&scaler->lock)) + return -ERESTARTSYS; + + ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); + if (!ctx) { + ret = -ENOMEM; + goto unlock; + } + + v4l2_fh_init(&ctx->fh, scaler->m2m.vfd); + ret = scaler_ctrls_create(ctx); + if (ret < 0) + goto error_fh; + + /* Use separate control handler per file handle */ + ctx->fh.ctrl_handler = &ctx->ctrl_handler; + file->private_data = &ctx->fh; + v4l2_fh_add(&ctx->fh); + + ctx->scaler_dev = scaler; + /* Default color format */ + ctx->s_frame.fmt = scaler_get_format(0); + ctx->d_frame.fmt = scaler_get_format(0); + ctx->flags = 0; + + ctx->m2m_ctx = v4l2_m2m_ctx_init(scaler->m2m.m2m_dev, ctx, queue_init); + if (IS_ERR(ctx->m2m_ctx)) { + scaler_dbg(scaler, "Failed to initialize m2m context"); + ret = PTR_ERR(ctx->m2m_ctx); + goto error_ctrls; + } + + /* Apply default format settings */ + ret = scaler_m2m_set_default_format(ctx); + if (ret < 0) { + scaler_dbg(scaler, "Failed to set default format settings"); + goto error_ctrls; + } + + if (scaler->m2m.refcnt++ == 0) + set_bit(ST_M2M_OPEN, &scaler->state); + + scaler_dbg(scaler, "scaler m2m driver is opened, ctx(0x%p)", ctx); + + mutex_unlock(&scaler->lock); + return 0; + +error_ctrls: + scaler_ctrls_delete(ctx); +error_fh: + v4l2_fh_del(&ctx->fh); + v4l2_fh_exit(&ctx->fh); + kfree(ctx); +unlock: + mutex_unlock(&scaler->lock); + return ret; +} + +static int scaler_m2m_release(struct file *file) +{ + struct scaler_ctx *ctx = fh_to_ctx(file->private_data); + struct scaler_dev *scaler = ctx->scaler_dev; + + scaler_dbg(scaler, "pid: %d, state: 0x%lx, refcnt= %d", + task_pid_nr(current), scaler->state, scaler->m2m.refcnt); + + mutex_lock(&scaler->lock); + + v4l2_m2m_ctx_release(ctx->m2m_ctx); + scaler_ctrls_delete(ctx); + v4l2_fh_del(&ctx->fh); + v4l2_fh_exit(&ctx->fh); + + if (--scaler->m2m.refcnt <= 0) + clear_bit(ST_M2M_OPEN, &scaler->state); + kfree(ctx); + + mutex_unlock(&scaler->lock); + return 0; +} + +static unsigned int scaler_m2m_poll(struct file *file, + struct poll_table_struct *wait) +{ + struct scaler_ctx *ctx = fh_to_ctx(file->private_data); + struct scaler_dev *scaler = ctx->scaler_dev; + int ret; + + if (mutex_lock_interruptible(&scaler->lock)) + return -ERESTARTSYS; + + ret = v4l2_m2m_poll(file, ctx->m2m_ctx, wait); + mutex_unlock(&scaler->lock); + + return ret; +} + +static int scaler_m2m_mmap(struct file *file, struct vm_area_struct *vma) +{ + struct scaler_ctx *ctx = fh_to_ctx(file->private_data); + struct scaler_dev *scaler = ctx->scaler_dev; + int ret; + + if (mutex_lock_interruptible(&scaler->lock)) + return -ERESTARTSYS; + + ret = v4l2_m2m_mmap(file, ctx->m2m_ctx, vma); + mutex_unlock(&scaler->lock); + + return ret; +} + +static const struct v4l2_file_operations scaler_m2m_fops = { + .owner = THIS_MODULE, + .open = scaler_m2m_open, + .release = scaler_m2m_release, + .poll = scaler_m2m_poll, + .unlocked_ioctl = video_ioctl2, + .mmap = scaler_m2m_mmap, +}; + +static struct v4l2_m2m_ops scaler_m2m_ops = { + .device_run = scaler_m2m_device_run, + .job_abort = scaler_m2m_job_abort, +}; + +int scaler_register_m2m_device(struct scaler_dev *scaler) +{ + struct platform_device *pdev; + int ret; + + if (!scaler) + return -ENODEV; + + pdev = scaler->pdev; + + scaler->vdev.fops = &scaler_m2m_fops; + scaler->vdev.ioctl_ops = &scaler_m2m_ioctl_ops; + scaler->vdev.release = video_device_release_empty; + scaler->vdev.lock = &scaler->lock; + scaler->vdev.vfl_dir = VFL_DIR_M2M; + snprintf(scaler->vdev.name, sizeof(scaler->vdev.name), "%s:m2m", + SCALER_MODULE_NAME); + + video_set_drvdata(&scaler->vdev, scaler); + + scaler->m2m.vfd = &scaler->vdev; + scaler->m2m.m2m_dev = v4l2_m2m_init(&scaler_m2m_ops); + if (IS_ERR(scaler->m2m.m2m_dev)) { + dev_err(&pdev->dev, "failed to initialize v4l2-m2m device\n"); + return PTR_ERR(scaler->m2m.m2m_dev); + } + + ret = video_register_device(&scaler->vdev, VFL_TYPE_GRABBER, -1); + if (ret < 0) { + dev_err(&pdev->dev, + "%s(): failed to register video device\n", __func__); + v4l2_m2m_release(scaler->m2m.m2m_dev); + return ret; + } + + dev_info(&pdev->dev, "scaler m2m driver registered as /dev/video%d", + scaler->vdev.num); + return 0; +} + +void scaler_unregister_m2m_device(struct scaler_dev *scaler) +{ + if (scaler) { + video_unregister_device(scaler->m2m.vfd); + v4l2_m2m_release(scaler->m2m.m2m_dev); + } +}
This patch adds the Makefile and memory to memory (m2m) interface functionality for the SCALER driver. Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com> --- drivers/media/platform/Kconfig | 8 + drivers/media/platform/Makefile | 1 + drivers/media/platform/exynos-scaler/Makefile | 3 + drivers/media/platform/exynos-scaler/scaler-m2m.c | 781 +++++++++++++++++++++ 4 files changed, 793 insertions(+) create mode 100644 drivers/media/platform/exynos-scaler/Makefile create mode 100644 drivers/media/platform/exynos-scaler/scaler-m2m.c