Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756950AbdDFJew (ORCPT ); Thu, 6 Apr 2017 05:34:52 -0400 Received: from mail-wr0-f169.google.com ([209.85.128.169]:35658 "EHLO mail-wr0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934279AbdDFJeM (ORCPT ); Thu, 6 Apr 2017 05:34:12 -0400 From: Neil Armstrong To: dri-devel@lists.freedesktop.org Cc: Neil Armstrong , laurent.pinchart+renesas@ideasonboard.com, architt@codeaurora.org, Jose.Abreu@synopsys.com, linux-kernel@vger.kernel.org, Dan Carpenter Subject: [PATCH] drm: bridge: dw-hdmi: fix input format/encoding from plat_data Date: Thu, 6 Apr 2017 11:34:04 +0200 Message-Id: <1491471244-24989-1-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1631 Lines: 42 The plat_data->input_bus_format and plat_data->input_bus_encoding are unsigned long and are alsways >=0, but the value 0 was still considered as RGB888 like the default behaviour. This patch changes the if test to > 0. 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). [1] http://lkml.kernel.org/r/20170406052120.GA26578@mwanda Cc: Dan Carpenter Signed-off-by: Neil Armstrong --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 8b60503..100e1ee 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1668,14 +1668,14 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) 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->plat_data->input_bus_format; else 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 = hdmi->plat_data->input_bus_encoding; else -- 1.9.1