From: Johan Jonker <jbx6244@gmail.com>
To: hjc@rock-chips.com, heiko@sntech.de
Cc: airlied@gmail.com, daniel@ffwll.ch,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 3/4] drm/rockchip: rk3066_hdmi: Remove useless output format
Date: Thu, 2 Nov 2023 14:42:19 +0100 [thread overview]
Message-ID: <bb5cac77-a705-738e-13ae-667ea87f1cb1@gmail.com> (raw)
In-Reply-To: <cda574be-4f33-b66d-eb14-92c2b31d241e@gmail.com>
The Rk3066 hdmi output format is hard coded to RGB. Remove
all useless code related to colorimetry and enc_out_format.
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
drivers/gpu/drm/rockchip/rk3066_hdmi.c | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c
index 0e7aae341960..f2b1b2faa096 100644
--- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c
+++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c
@@ -23,8 +23,6 @@
struct hdmi_data_info {
int vic; /* The CEA Video ID (VIC) of the current drm display mode. */
- unsigned int enc_out_format;
- unsigned int colorimetry;
};
struct rk3066_hdmi_i2c {
@@ -200,14 +198,7 @@ static int rk3066_hdmi_config_avi(struct rk3066_hdmi *hdmi,
rc = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
&hdmi->connector, mode);
- if (hdmi->hdmi_data.enc_out_format == HDMI_COLORSPACE_YUV444)
- frame.avi.colorspace = HDMI_COLORSPACE_YUV444;
- else if (hdmi->hdmi_data.enc_out_format == HDMI_COLORSPACE_YUV422)
- frame.avi.colorspace = HDMI_COLORSPACE_YUV422;
- else
- frame.avi.colorspace = HDMI_COLORSPACE_RGB;
-
- frame.avi.colorimetry = hdmi->hdmi_data.colorimetry;
+ frame.avi.colorspace = HDMI_COLORSPACE_RGB;
frame.avi.scan_mode = HDMI_SCAN_MODE_NONE;
return rk3066_hdmi_upload_frame(hdmi, rc, &frame,
@@ -329,15 +320,6 @@ static int rk3066_hdmi_setup(struct rk3066_hdmi *hdmi,
struct drm_display_info *display = &hdmi->connector.display_info;
hdmi->hdmi_data.vic = drm_match_cea_mode(mode);
- hdmi->hdmi_data.enc_out_format = HDMI_COLORSPACE_RGB;
-
- if (hdmi->hdmi_data.vic == 6 || hdmi->hdmi_data.vic == 7 ||
- hdmi->hdmi_data.vic == 21 || hdmi->hdmi_data.vic == 22 ||
- hdmi->hdmi_data.vic == 2 || hdmi->hdmi_data.vic == 3 ||
- hdmi->hdmi_data.vic == 17 || hdmi->hdmi_data.vic == 18)
- hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_601;
- else
- hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_709;
hdmi->tmdsclk = mode->clock * 1000;
--
2.39.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-11-02 13:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 13:40 [PATCH v1 0/4] Rockchip rk3066_hdmi update Johan Jonker
2023-11-02 13:41 ` [PATCH v1 1/4] drm/rockchip: rk3066_hdmi: Remove useless mode_fixup Johan Jonker
2023-11-02 13:42 ` [PATCH v1 2/4] drm/rockchip: rk3066_hdmi: Switch encoder hooks to atomic Johan Jonker
2023-11-02 13:42 ` Johan Jonker [this message]
2023-11-20 17:06 ` [PATCH v1 3/4] drm/rockchip: rk3066_hdmi: Remove useless output format Heiko Stuebner
2023-11-23 12:54 ` Johan Jonker
2023-11-24 3:17 ` Andy Yan
2023-11-27 11:25 ` Heiko Stübner
2023-11-02 13:42 ` [PATCH v1 4/4] drm/rockchip: rk3066_hdmi: Remove unused drm device pointer Johan Jonker
2023-11-20 17:02 ` (subset) [PATCH v1 0/4] Rockchip rk3066_hdmi update Heiko Stuebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bb5cac77-a705-738e-13ae-667ea87f1cb1@gmail.com \
--to=jbx6244@gmail.com \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).