MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-12 12:25:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

media: rcar-vin: Fix YUYV8_1X16 handling for CSI-2

Browse Source 
[ Upstream commit 9caf253e8a ]

The YUYV8_1X16 and UYVY8_1X16 formats are treated as 'ITU-R
BT.601/BT.1358 16-bit YCbCr-422 input' (YUV16 - 0x5) in the R-Car VIN
driver and are thus disallowed when capturing frames from the R-Car
CSI-2 interface according to the hardware manual.

As the 1X16 format variants are meant to be used with serial busses they
have to be treated as 'YCbCr-422 8-bit data input' (0x1) when capturing
from CSI-2, which is a valid setting for CSI-2.

Commit 78b3f9d75a ("media: rcar-vin: Add check that input interface
and format are valid") disallowed capturing YUV16 when using the CSI-2
interface. Fix this by using YUV8_BT601 for YCbCr422 when CSI-2 is in
use.

Fixes: 78b3f9d75a ("media: rcar-vin: Add check that input interface and format are valid")
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/20240617161135.130719-2-jacopo.mondi@ideasonboard.com
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jacopo Mondi 2024-06-17 18:11:24 +02:00 committed by Greg Kroah-Hartman
parent c6ad6096f9
commit ea4f6c74d4
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/platform/renesas/rcar-vin/rcar-dma.c
View File

@ -742,12 +742,22 @@ static int rvin_setup(struct rvin_dev *vin)
*/ */
switch (vin->mbus_code) { switch (vin->mbus_code) {
case MEDIA_BUS_FMT_YUYV8_1X16: case MEDIA_BUS_FMT_YUYV8_1X16:
/* BT.601/BT.1358 16bit YCbCr422 */ if (vin->is_csi)
vnmc |= VNMC_INF_YUV16; /* YCbCr422 8-bit */
vnmc |= VNMC_INF_YUV8_BT601;
else
/* BT.601/BT.1358 16bit YCbCr422 */
vnmc |= VNMC_INF_YUV16;
input_is_yuv = true; input_is_yuv = true;
break; break;
case MEDIA_BUS_FMT_UYVY8_1X16: case MEDIA_BUS_FMT_UYVY8_1X16:
vnmc |= VNMC_INF_YUV16 | VNMC_YCAL; if (vin->is_csi)
/* YCbCr422 8-bit */
vnmc |= VNMC_INF_YUV8_BT601;
else
/* BT.601/BT.1358 16bit YCbCr422 */
vnmc |= VNMC_INF_YUV16;
vnmc |= VNMC_YCAL;
input_is_yuv = true; input_is_yuv = true;
break; break;
case MEDIA_BUS_FMT_UYVY8_2X8: case MEDIA_BUS_FMT_UYVY8_2X8: