From nobody Wed Dec 17 10:56:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0919C46CA0 for ; Tue, 28 Nov 2023 10:28:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234909AbjK1K2Y (ORCPT ); Tue, 28 Nov 2023 05:28:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344409AbjK1K1l (ORCPT ); Tue, 28 Nov 2023 05:27:41 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C93F2D40 for ; Tue, 28 Nov 2023 02:25:46 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71ECAC43397; Tue, 28 Nov 2023 10:25:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701167146; bh=cewGjSfrxsWvWPkrDxnbvQOKsF0K1kZ/Vi1wxjvWMJU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AoC8BAXVAN8YKhH6+iXmJP08aAXvlPWtk/wgDwxz/h04z3leGGBtOB+tGmtkzKX9i gFTHUlMEeS2j9T8s4LgRD4MOIG0kpcgfROLFP1CrBHibfC/fFRlyvp/N4zotaMLlpx 981iEQ/K+REyMXaIsmjldWy1wRqtAo2ZUuf+MCLEc5CdNKL111sxYNvmvimuX7TdiI IXd56pJDl2/ah5dkaf7ME6CUBAeWyWEdH1XDaiW1coZBp+7JuLzqP2zD7HVu6kXyg2 /lWS6oxgycsohXaqSilSZBTTMK7DSFw3qQIgkQaK4Zv5Rb0XiBzlMF85mim5dorwJ5 YemY+7FwivhEw== From: Maxime Ripard Date: Tue, 28 Nov 2023 11:24:40 +0100 Subject: [PATCH v4 29/45] drm/rockchip: inno_hdmi: Remove useless input format MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231128-kms-hdmi-connector-state-v4-29-c7602158306e@kernel.org> References: <20231128-kms-hdmi-connector-state-v4-0-c7602158306e@kernel.org> In-Reply-To: <20231128-kms-hdmi-connector-state-v4-0-c7602158306e@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter , Emma Anholt , Jonathan Corbet , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland Cc: Hans Verkuil , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Maxime Ripard X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3445; i=mripard@kernel.org; h=from:subject:message-id; bh=cewGjSfrxsWvWPkrDxnbvQOKsF0K1kZ/Vi1wxjvWMJU=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDKmp+y91VQXbbmKdepgjZP+8dQ+sooMNHyQcqTq9ufKV6 d8kFr2tHaUsDGJcDLJiiiwxwuZL4k7Net3JxjcPZg4rE8gQBi5OAZhI9l6G3yzb2HoSX6RpOZgZ TD4y1dzUacbaXeWMW+/v47Nt8mF/VMTwVyr5kcaVnmym1I1i/jmfIy8zXpt4KnzZzJvu1hfFZsj eZgEA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver has a lot of logic to deal with multiple input formats, but hardcodes it to RGB. This means that most of that code has been dead code, so let's get rid of it. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/rockchip/inno_hdmi.c | 39 +++++++++-----------------------= ---- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchi= p/inno_hdmi.c index 3908dc09d85f..e0696ab16da3 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -28,7 +28,6 @@ #include "inno_hdmi.h" =20 struct hdmi_data_info { - unsigned int enc_in_format; unsigned int enc_out_format; unsigned int colorimetry; }; @@ -328,47 +327,30 @@ static int inno_hdmi_config_video_csc(struct inno_hdm= i *hdmi) v_VIDEO_INPUT_CSP(0); hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL2, value); =20 - if (data->enc_in_format =3D=3D data->enc_out_format) { - if ((data->enc_in_format =3D=3D HDMI_COLORSPACE_RGB) || - (data->enc_in_format >=3D HDMI_COLORSPACE_YUV444)) { - value =3D v_SOF_DISABLE | v_COLOR_DEPTH_NOT_INDICATED(1); - hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL3, value); + if (HDMI_COLORSPACE_RGB =3D=3D data->enc_out_format) { + value =3D v_SOF_DISABLE | v_COLOR_DEPTH_NOT_INDICATED(1); + hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL3, value); =20 - hdmi_modb(hdmi, HDMI_VIDEO_CONTRL, - m_VIDEO_AUTO_CSC | m_VIDEO_C0_C2_SWAP, - v_VIDEO_AUTO_CSC(AUTO_CSC_DISABLE) | - v_VIDEO_C0_C2_SWAP(C0_C2_CHANGE_DISABLE)); - return 0; - } + hdmi_modb(hdmi, HDMI_VIDEO_CONTRL, + m_VIDEO_AUTO_CSC | m_VIDEO_C0_C2_SWAP, + v_VIDEO_AUTO_CSC(AUTO_CSC_DISABLE) | + v_VIDEO_C0_C2_SWAP(C0_C2_CHANGE_DISABLE)); + return 0; } =20 if (data->colorimetry =3D=3D HDMI_COLORIMETRY_ITU_601) { - if ((data->enc_in_format =3D=3D HDMI_COLORSPACE_RGB) && - (data->enc_out_format =3D=3D HDMI_COLORSPACE_YUV444)) { + if (data->enc_out_format =3D=3D HDMI_COLORSPACE_YUV444) { csc_mode =3D CSC_RGB_0_255_TO_ITU601_16_235_8BIT; auto_csc =3D AUTO_CSC_DISABLE; c0_c2_change =3D C0_C2_CHANGE_DISABLE; csc_enable =3D v_CSC_ENABLE; - } else if ((data->enc_in_format =3D=3D HDMI_COLORSPACE_YUV444) && - (data->enc_out_format =3D=3D HDMI_COLORSPACE_RGB)) { - csc_mode =3D CSC_ITU601_16_235_TO_RGB_0_255_8BIT; - auto_csc =3D AUTO_CSC_ENABLE; - c0_c2_change =3D C0_C2_CHANGE_DISABLE; - csc_enable =3D v_CSC_DISABLE; } } else { - if ((data->enc_in_format =3D=3D HDMI_COLORSPACE_RGB) && - (data->enc_out_format =3D=3D HDMI_COLORSPACE_YUV444)) { + if (data->enc_out_format =3D=3D HDMI_COLORSPACE_YUV444) { csc_mode =3D CSC_RGB_0_255_TO_ITU709_16_235_8BIT; auto_csc =3D AUTO_CSC_DISABLE; c0_c2_change =3D C0_C2_CHANGE_DISABLE; csc_enable =3D v_CSC_ENABLE; - } else if ((data->enc_in_format =3D=3D HDMI_COLORSPACE_YUV444) && - (data->enc_out_format =3D=3D HDMI_COLORSPACE_RGB)) { - csc_mode =3D CSC_ITU709_16_235_TO_RGB_0_255_8BIT; - auto_csc =3D AUTO_CSC_ENABLE; - c0_c2_change =3D C0_C2_CHANGE_DISABLE; - csc_enable =3D v_CSC_DISABLE; } } =20 @@ -443,7 +425,6 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi, struct drm_display_info *display =3D &hdmi->connector.display_info; u8 vic =3D drm_match_cea_mode(mode); =20 - hdmi->hdmi_data.enc_in_format =3D HDMI_COLORSPACE_RGB; hdmi->hdmi_data.enc_out_format =3D HDMI_COLORSPACE_RGB; =20 if ((vic =3D=3D 6) || (vic =3D=3D 7) || --=20 2.41.0