+++ /dev/null
-From d27c36f9beed7d6a9d19ea1d642a7fb898eb6d95 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 14 Apr 2021 16:21:08 +0200
-Subject: [PATCH] drm/edid: Rename drm_hdmi_avi_infoframe_colorspace to
- _colorimetry
-
-The drm_hdmi_avi_infoframe_colorspace() function actually sets the
-colorimetry and extended_colorimetry fields in the hdmi_avi_infoframe
-structure with DRM_MODE_COLORIMETRY_* values.
-
-To make things worse, the hdmi_avi_infoframe structure also has a
-colorspace field used to signal whether an RGB or YUV output is being
-used.
-
-Let's remove the inconsistency and allow for the colorspace usage by
-renaming the function.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/drm_edid.c | 8 ++++----
- drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
- drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +-
- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
- include/drm/drm_edid.h | 4 ++--
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
---- a/drivers/gpu/drm/drm_edid.c
-+++ b/drivers/gpu/drm/drm_edid.c
-@@ -5746,13 +5746,13 @@ static const u32 hdmi_colorimetry_val[]
- #undef ACE
-
- /**
-- * drm_hdmi_avi_infoframe_colorspace() - fill the HDMI AVI infoframe
-- * colorspace information
-+ * drm_hdmi_avi_infoframe_colorimetry() - fill the HDMI AVI infoframe
-+ * colorimetry information
- * @frame: HDMI AVI infoframe
- * @conn_state: connector state
- */
- void
--drm_hdmi_avi_infoframe_colorspace(struct hdmi_avi_infoframe *frame,
-+drm_hdmi_avi_infoframe_colorimetry(struct hdmi_avi_infoframe *frame,
- const struct drm_connector_state *conn_state)
- {
- u32 colorimetry_val;
-@@ -5771,7 +5771,7 @@ drm_hdmi_avi_infoframe_colorspace(struct
- frame->extended_colorimetry = (colorimetry_val >> 2) &
- EXTENDED_COLORIMETRY_MASK;
- }
--EXPORT_SYMBOL(drm_hdmi_avi_infoframe_colorspace);
-+EXPORT_SYMBOL(drm_hdmi_avi_infoframe_colorimetry);
-
- /**
- * drm_hdmi_avi_infoframe_quant_range() - fill the HDMI AVI infoframe
---- a/drivers/gpu/drm/i915/display/intel_hdmi.c
-+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
-@@ -730,7 +730,7 @@ intel_hdmi_compute_avi_infoframe(struct
- else
- frame->colorspace = HDMI_COLORSPACE_RGB;
-
-- drm_hdmi_avi_infoframe_colorspace(frame, conn_state);
-+ drm_hdmi_avi_infoframe_colorimetry(frame, conn_state);
-
- /* nonsense combination */
- drm_WARN_ON(encoder->base.dev, crtc_state->limited_color_range &&
---- a/drivers/gpu/drm/i915/display/intel_lspcon.c
-+++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
-@@ -537,7 +537,7 @@ void lspcon_set_infoframes(struct intel_
- frame.avi.colorspace = HDMI_COLORSPACE_RGB;
-
- /* Set the Colorspace as per the HDMI spec */
-- drm_hdmi_avi_infoframe_colorspace(&frame.avi, conn_state);
-+ drm_hdmi_avi_infoframe_colorimetry(&frame.avi, conn_state);
-
- /* nonsense combination */
- drm_WARN_ON(encoder->base.dev, crtc_state->limited_color_range &&
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -517,7 +517,7 @@ static void vc4_hdmi_set_avi_infoframe(s
- vc4_encoder->limited_rgb_range ?
- HDMI_QUANTIZATION_RANGE_LIMITED :
- HDMI_QUANTIZATION_RANGE_FULL);
-- drm_hdmi_avi_infoframe_colorspace(&frame.avi, cstate);
-+ drm_hdmi_avi_infoframe_colorimetry(&frame.avi, cstate);
- drm_hdmi_avi_infoframe_bars(&frame.avi, cstate);
-
- vc4_hdmi_write_infoframe(encoder, &frame);
---- a/include/drm/drm_edid.h
-+++ b/include/drm/drm_edid.h
-@@ -401,8 +401,8 @@ drm_hdmi_vendor_infoframe_from_display_m
- const struct drm_display_mode *mode);
-
- void
--drm_hdmi_avi_infoframe_colorspace(struct hdmi_avi_infoframe *frame,
-- const struct drm_connector_state *conn_state);
-+drm_hdmi_avi_infoframe_colorimetry(struct hdmi_avi_infoframe *frame,
-+ const struct drm_connector_state *conn_state);
-
- void
- drm_hdmi_avi_infoframe_bars(struct hdmi_avi_infoframe *frame,