From: Dave Stevenson dave.stevenson@raspberrypi.com
[ Upstream commit 377cc006a364dfdab2f3f221cfad63a9265200b8 ]
When calling tc358743_set_fmt, the code was calling tc358743_get_fmt to choose a valid format. However that sets the colorspace based on information read back from the chip, not the colour format requested.
The result was that if you called try or set format for UYVY when the current format was RGB3 then you would get told SRGB, and try RGB3 when current was UYVY and you would get told SMPTE170M.
The value programmed in the VI_REP register for the colorspace is always set by this driver, therefore there is no need to read back the value, and never set to REC709. Return the colorspace based on the format set/tried instead.
Signed-off-by: Dave Stevenson dave.stevenson@raspberrypi.com Signed-off-by: Hans Verkuil hverkuil@xs4all.nl Signed-off-by: Sasha Levin sashal@kernel.org ---
LLM Generated explanations, may be completely bogus:
**Backport Status: YES**
This commit is a good candidate for backporting to stable kernel trees for the following reasons:
## Bug Fix Analysis
1. **Clear Bug Being Fixed**: The commit fixes an incorrect colorspace reporting bug in the tc358743 HDMI-to-CSI bridge driver. When calling `tc358743_set_fmt()` to set/try a format, the function was incorrectly returning the colorspace based on the *current* hardware state (read from VI_REP register) rather than the colorspace appropriate for the *requested* format.
2. **User-Visible Impact**: This bug causes incorrect colorspace metadata to be reported to userspace applications: - Requesting UYVY format when current is RGB would incorrectly report SRGB colorspace - Requesting RGB format when current is UYVY would incorrectly report SMPTE170M colorspace - This affects video capture applications that rely on correct colorspace information for proper color processing
## Code Analysis
3. **Small and Contained Fix**: The change is minimal and well- contained: - Adds a simple helper function `tc358743_g_colorspace()` that maps format codes to appropriate colorspaces - Removes the problematic register read (`i2c_rd8(sd, VI_REP)`) from `tc358743_get_fmt()` - Updates both `tc358743_get_fmt()` and `tc358743_set_fmt()` to use the helper function - Total change is about 40 lines with clear logic
4. **No Architectural Changes**: The fix doesn't introduce any new features or change the driver architecture - it simply corrects the colorspace reporting logic to be consistent and predictable.
5. **Low Risk of Regression**: - The driver always writes the VI_REP register value itself in `tc358743_set_csi_color_space()` (lines 690-691 for UYVY, 702-703 for RGB) - The commit message correctly notes "The value programmed in the VI_REP register for the colorspace is always set by this driver" - The new implementation is simpler and more predictable than reading back hardware state - The colorspace mapping (RGB→SRGB, UYVY→SMPTE170M) is standard and correct
6. **No Side Effects**: The change only affects the colorspace field reporting and doesn't modify any hardware programming, timing configuration, or data flow.
7. **Subsystem Isolation**: The tc358743 is a specific HDMI-to-CSI bridge chip driver that's relatively isolated from core kernel functionality. Changes here won't affect system stability.
The commit meets stable kernel criteria as it fixes a real bug that affects userspace applications without introducing new features or risky changes. The fix is simple, correct, and unlikely to cause regressions.
drivers/media/i2c/tc358743.c | 44 ++++++++++++++---------------------- 1 file changed, 17 insertions(+), 27 deletions(-)
diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c index 8c269e28fd5f..0bf6481dd0d9 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -1708,12 +1708,23 @@ static int tc358743_enum_mbus_code(struct v4l2_subdev *sd, return 0; }
+static u32 tc358743_g_colorspace(u32 code) +{ + switch (code) { + case MEDIA_BUS_FMT_RGB888_1X24: + return V4L2_COLORSPACE_SRGB; + case MEDIA_BUS_FMT_UYVY8_1X16: + return V4L2_COLORSPACE_SMPTE170M; + default: + return 0; + } +} + static int tc358743_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_format *format) { struct tc358743_state *state = to_state(sd); - u8 vi_rep = i2c_rd8(sd, VI_REP);
if (format->pad != 0) return -EINVAL; @@ -1723,23 +1734,7 @@ static int tc358743_get_fmt(struct v4l2_subdev *sd, format->format.height = state->timings.bt.height; format->format.field = V4L2_FIELD_NONE;
- switch (vi_rep & MASK_VOUT_COLOR_SEL) { - case MASK_VOUT_COLOR_RGB_FULL: - case MASK_VOUT_COLOR_RGB_LIMITED: - format->format.colorspace = V4L2_COLORSPACE_SRGB; - break; - case MASK_VOUT_COLOR_601_YCBCR_LIMITED: - case MASK_VOUT_COLOR_601_YCBCR_FULL: - format->format.colorspace = V4L2_COLORSPACE_SMPTE170M; - break; - case MASK_VOUT_COLOR_709_YCBCR_FULL: - case MASK_VOUT_COLOR_709_YCBCR_LIMITED: - format->format.colorspace = V4L2_COLORSPACE_REC709; - break; - default: - format->format.colorspace = 0; - break; - } + format->format.colorspace = tc358743_g_colorspace(format->format.code);
return 0; } @@ -1753,19 +1748,14 @@ static int tc358743_set_fmt(struct v4l2_subdev *sd, u32 code = format->format.code; /* is overwritten by get_fmt */ int ret = tc358743_get_fmt(sd, sd_state, format);
- format->format.code = code; + if (code == MEDIA_BUS_FMT_RGB888_1X24 || + code == MEDIA_BUS_FMT_UYVY8_1X16) + format->format.code = code; + format->format.colorspace = tc358743_g_colorspace(format->format.code);
if (ret) return ret;
- switch (code) { - case MEDIA_BUS_FMT_RGB888_1X24: - case MEDIA_BUS_FMT_UYVY8_1X16: - break; - default: - return -EINVAL; - } - if (format->which == V4L2_SUBDEV_FORMAT_TRY) return 0;