blob: b50ca021260531c341d39c78717c7622293ef540 [file] [log] [blame]
From e2d8455e5c53f4d97284693650b87b2942a5b312 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <>
Date: Thu, 6 Apr 2017 11:34:04 +0200
Subject: [PATCH 245/286] drm: bridge: dw-hdmi: fix input format/encoding from
The plat_data->input_bus_format and plat_data->input_bus_encoding
are unsigned long and are always >=0, but the value 0 was still
considered as RGB888 for input_bus_format and default color space
for input_bus_encoding in the reworked code.
This patch changes the if statement check for a non-zero value to
either use the default input bus_format and/or bus_encoding for a zero
value and the provided bus_format and/or bus_encoding for a
non zero value.
Thanks to Dan Carpenter for his bug report at [1].
Tested on Amlogic P230 (with CSC enabled for YUV444 to RGB) and Rockchip
RK3288 ACT8846 EVB Board (no CSC involved, direct RGB passthrough).
Cc: Dan Carpenter <>
Fixes: def23aa7e982 ("drm: bridge: dw-hdmi: Switch to V4L bus format and encodings")
Signed-off-by: Neil Armstrong <>
Reviewed-by: Archit Taneja <>
[ reworded commit message and added Fixes tag]
(cherry picked from commit e20c29aa722a90f3b8092b340362eabe488dbfc4)
Signed-off-by: Simon Horman <>
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1654,14 +1654,14 @@ static int dw_hdmi_setup(struct dw_hdmi
hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 0;
/* TOFIX: Get input format from plat data or fallback to RGB888 */
- if (hdmi->plat_data->input_bus_format >= 0)
+ if (hdmi->plat_data->input_bus_format)
hdmi->hdmi_data.enc_in_bus_format =
hdmi->hdmi_data.enc_in_bus_format = MEDIA_BUS_FMT_RGB888_1X24;
/* TOFIX: Get input encoding from plat data or fallback to none */
- if (hdmi->plat_data->input_bus_encoding >= 0)
+ if (hdmi->plat_data->input_bus_encoding)
hdmi->hdmi_data.enc_in_encoding =