| Message ID | 20201002102652.9154-1-prabhakar.mahadev-lad.rj@bp.renesas.com |
|---|---|
| State | Accepted |
| Commit | 811b8d66f936f48ec8ed330756c6be226cf28b68 |
| Headers | show |
| Series | media: rcar-vin: rcar-dma: Fix setting VNIS_REG for RAW8 formats | expand |
Hi Lad, Thanks for catching and fixing this. On 2020-10-02 11:26:52 +0100, Lad Prabhakar wrote: > pixelformat in vin priv structure holds V4L2_PIX_FMT_* and not > MEDIA_BUS_FMT_* so make sure we check against V4L2_PIX_FMT_* formats > while setting the VNIS_REG. > > Fixes: 8c3e0f67df6c9 ("media: rcar-vin: Extend RAW8 support to all RGB layouts") > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > Hi Hans, > > If it isn't too late for v5.10 could you please queue up this patch. > > Cheers, > Prabhakar > --- > drivers/media/platform/rcar-vin/rcar-dma.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c > index e9a47b705acc..692dea300b0d 100644 > --- a/drivers/media/platform/rcar-vin/rcar-dma.c > +++ b/drivers/media/platform/rcar-vin/rcar-dma.c > @@ -600,10 +600,10 @@ void rvin_crop_scale_comp(struct rvin_dev *vin) > * format in 2 pixel unit hence configure VNIS_REG as stride / 2. > */ > switch (vin->format.pixelformat) { > - case MEDIA_BUS_FMT_SBGGR8_1X8: > - case MEDIA_BUS_FMT_SGBRG8_1X8: > - case MEDIA_BUS_FMT_SGRBG8_1X8: > - case MEDIA_BUS_FMT_SRGGB8_1X8: > + case V4L2_PIX_FMT_SBGGR8: > + case V4L2_PIX_FMT_SGBRG8: > + case V4L2_PIX_FMT_SGRBG8: > + case V4L2_PIX_FMT_SRGGB8: > stride /= 2; > break; > default: > -- > 2.17.1 >
diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c index e9a47b705acc..692dea300b0d 100644 --- a/drivers/media/platform/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/rcar-vin/rcar-dma.c @@ -600,10 +600,10 @@ void rvin_crop_scale_comp(struct rvin_dev *vin) * format in 2 pixel unit hence configure VNIS_REG as stride / 2. */ switch (vin->format.pixelformat) { - case MEDIA_BUS_FMT_SBGGR8_1X8: - case MEDIA_BUS_FMT_SGBRG8_1X8: - case MEDIA_BUS_FMT_SGRBG8_1X8: - case MEDIA_BUS_FMT_SRGGB8_1X8: + case V4L2_PIX_FMT_SBGGR8: + case V4L2_PIX_FMT_SGBRG8: + case V4L2_PIX_FMT_SGRBG8: + case V4L2_PIX_FMT_SRGGB8: stride /= 2; break; default:
pixelformat in vin priv structure holds V4L2_PIX_FMT_* and not MEDIA_BUS_FMT_* so make sure we check against V4L2_PIX_FMT_* formats while setting the VNIS_REG. Fixes: 8c3e0f67df6c9 ("media: rcar-vin: Extend RAW8 support to all RGB layouts") Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com> --- Hi Hans, If it isn't too late for v5.10 could you please queue up this patch. Cheers, Prabhakar --- drivers/media/platform/rcar-vin/rcar-dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)