| Message ID | 20200629065754.26621-4-dafna.hirschfeld@collabora.com |
|---|---|
| State | Accepted |
| Commit | 8d4a696af361af57bb84f3cc063473d241afc638 |
| Headers | show |
| Series | media: staging: rkisp1: document rkisp1-common.h | expand |
On 6/29/20 3:57 AM, Dafna Hirschfeld wrote: > Currently the 'pads' and 'pad_cfg' arries of the rkisp1_resizer > are of size 'RKISP1_ISP_PAD_MAX' which is 4. But the resizer > has only two pads. This patch change the size of the arries to 2 > by adding and using 'RKISP1_RSZ_PAD_MAX' similar to the way it is > done in the isp entity. s/arries/arrays s/This patch change/Change Hans, could you correct these when picking it up? > > Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> Acked-by: Helen Koike <helen.koike@collabora.com> Thanks Helen > --- > drivers/staging/media/rkisp1/rkisp1-common.h | 5 +++-- > drivers/staging/media/rkisp1/rkisp1-resizer.c | 2 +- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h > index b7dc523dd8f0..4185487c520c 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-common.h > +++ b/drivers/staging/media/rkisp1/rkisp1-common.h > @@ -49,6 +49,7 @@ > enum rkisp1_rsz_pad { > RKISP1_RSZ_PAD_SINK, > RKISP1_RSZ_PAD_SRC, > + RKISP1_RSZ_PAD_MAX > }; > > enum rkisp1_stream_id { > @@ -216,8 +217,8 @@ struct rkisp1_resizer { > struct v4l2_subdev sd; > enum rkisp1_stream_id id; > struct rkisp1_device *rkisp1; > - struct media_pad pads[RKISP1_ISP_PAD_MAX]; > - struct v4l2_subdev_pad_config pad_cfg[RKISP1_ISP_PAD_MAX]; > + struct media_pad pads[RKISP1_RSZ_PAD_MAX]; > + struct v4l2_subdev_pad_config pad_cfg[RKISP1_RSZ_PAD_MAX]; > const struct rkisp1_rsz_config *config; > enum v4l2_pixel_encoding pixel_enc; > struct mutex ops_lock; > diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/staging/media/rkisp1/rkisp1-resizer.c > index 26fb41053f56..d8ebe4422e77 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-resizer.c > +++ b/drivers/staging/media/rkisp1/rkisp1-resizer.c > @@ -735,7 +735,7 @@ static int rkisp1_rsz_register(struct rkisp1_resizer *rsz) > rsz->pixel_enc = RKISP1_DEF_PIXEL_ENC; > > mutex_init(&rsz->ops_lock); > - ret = media_entity_pads_init(&sd->entity, 2, pads); > + ret = media_entity_pads_init(&sd->entity, RKISP1_RSZ_PAD_MAX, pads); > if (ret) > return ret; > >
On 13/07/2020 13:12, Helen Koike wrote: > > > On 6/29/20 3:57 AM, Dafna Hirschfeld wrote: >> Currently the 'pads' and 'pad_cfg' arries of the rkisp1_resizer >> are of size 'RKISP1_ISP_PAD_MAX' which is 4. But the resizer >> has only two pads. This patch change the size of the arries to 2 >> by adding and using 'RKISP1_RSZ_PAD_MAX' similar to the way it is >> done in the isp entity. > > s/arries/arrays > > s/This patch change/Change > > Hans, could you correct these when picking it up? I can. I'll take patches 1-3 and will take a v2 of patch 4/4 once it is posted. Regards, Hans > >> >> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> > > Acked-by: Helen Koike <helen.koike@collabora.com> > > Thanks > Helen > >> --- >> drivers/staging/media/rkisp1/rkisp1-common.h | 5 +++-- >> drivers/staging/media/rkisp1/rkisp1-resizer.c | 2 +- >> 2 files changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h >> index b7dc523dd8f0..4185487c520c 100644 >> --- a/drivers/staging/media/rkisp1/rkisp1-common.h >> +++ b/drivers/staging/media/rkisp1/rkisp1-common.h >> @@ -49,6 +49,7 @@ >> enum rkisp1_rsz_pad { >> RKISP1_RSZ_PAD_SINK, >> RKISP1_RSZ_PAD_SRC, >> + RKISP1_RSZ_PAD_MAX >> }; >> >> enum rkisp1_stream_id { >> @@ -216,8 +217,8 @@ struct rkisp1_resizer { >> struct v4l2_subdev sd; >> enum rkisp1_stream_id id; >> struct rkisp1_device *rkisp1; >> - struct media_pad pads[RKISP1_ISP_PAD_MAX]; >> - struct v4l2_subdev_pad_config pad_cfg[RKISP1_ISP_PAD_MAX]; >> + struct media_pad pads[RKISP1_RSZ_PAD_MAX]; >> + struct v4l2_subdev_pad_config pad_cfg[RKISP1_RSZ_PAD_MAX]; >> const struct rkisp1_rsz_config *config; >> enum v4l2_pixel_encoding pixel_enc; >> struct mutex ops_lock; >> diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/staging/media/rkisp1/rkisp1-resizer.c >> index 26fb41053f56..d8ebe4422e77 100644 >> --- a/drivers/staging/media/rkisp1/rkisp1-resizer.c >> +++ b/drivers/staging/media/rkisp1/rkisp1-resizer.c >> @@ -735,7 +735,7 @@ static int rkisp1_rsz_register(struct rkisp1_resizer *rsz) >> rsz->pixel_enc = RKISP1_DEF_PIXEL_ENC; >> >> mutex_init(&rsz->ops_lock); >> - ret = media_entity_pads_init(&sd->entity, 2, pads); >> + ret = media_entity_pads_init(&sd->entity, RKISP1_RSZ_PAD_MAX, pads); >> if (ret) >> return ret; >> >>
diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h index b7dc523dd8f0..4185487c520c 100644 --- a/drivers/staging/media/rkisp1/rkisp1-common.h +++ b/drivers/staging/media/rkisp1/rkisp1-common.h @@ -49,6 +49,7 @@ enum rkisp1_rsz_pad { RKISP1_RSZ_PAD_SINK, RKISP1_RSZ_PAD_SRC, + RKISP1_RSZ_PAD_MAX }; enum rkisp1_stream_id { @@ -216,8 +217,8 @@ struct rkisp1_resizer { struct v4l2_subdev sd; enum rkisp1_stream_id id; struct rkisp1_device *rkisp1; - struct media_pad pads[RKISP1_ISP_PAD_MAX]; - struct v4l2_subdev_pad_config pad_cfg[RKISP1_ISP_PAD_MAX]; + struct media_pad pads[RKISP1_RSZ_PAD_MAX]; + struct v4l2_subdev_pad_config pad_cfg[RKISP1_RSZ_PAD_MAX]; const struct rkisp1_rsz_config *config; enum v4l2_pixel_encoding pixel_enc; struct mutex ops_lock; diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/staging/media/rkisp1/rkisp1-resizer.c index 26fb41053f56..d8ebe4422e77 100644 --- a/drivers/staging/media/rkisp1/rkisp1-resizer.c +++ b/drivers/staging/media/rkisp1/rkisp1-resizer.c @@ -735,7 +735,7 @@ static int rkisp1_rsz_register(struct rkisp1_resizer *rsz) rsz->pixel_enc = RKISP1_DEF_PIXEL_ENC; mutex_init(&rsz->ops_lock); - ret = media_entity_pads_init(&sd->entity, 2, pads); + ret = media_entity_pads_init(&sd->entity, RKISP1_RSZ_PAD_MAX, pads); if (ret) return ret;
Currently the 'pads' and 'pad_cfg' arries of the rkisp1_resizer are of size 'RKISP1_ISP_PAD_MAX' which is 4. But the resizer has only two pads. This patch change the size of the arries to 2 by adding and using 'RKISP1_RSZ_PAD_MAX' similar to the way it is done in the isp entity. Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> --- drivers/staging/media/rkisp1/rkisp1-common.h | 5 +++-- drivers/staging/media/rkisp1/rkisp1-resizer.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)