On Wed, Dec 15, 2021 at 01:43:54PM +0100, Maxime Ripard wrote: > 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 <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]> Sadly we can't rename the property itself. > --- > 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(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index e57d1b8cdaaa..dec7aecfc655 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -5890,13 +5890,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; > @@ -5915,7 +5915,7 @@ drm_hdmi_avi_infoframe_colorspace(struct > hdmi_avi_infoframe *frame, > 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 > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c > b/drivers/gpu/drm/i915/display/intel_hdmi.c > index 3b5b9e7b05b7..96e508ddc4af 100644 > --- 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 intel_encoder > *encoder, > 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 && > diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c > b/drivers/gpu/drm/i915/display/intel_lspcon.c > index 05d2d750fa53..092a925c6cf5 100644 > --- 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_encoder *encoder, > 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 && > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index 053fbaf765ca..be39e55ae113 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -502,7 +502,7 @@ static void vc4_hdmi_set_avi_infoframe(struct drm_encoder > *encoder) > 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); > diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h > index 18f6c700f6d0..144c495b99c4 100644 > --- a/include/drm/drm_edid.h > +++ b/include/drm/drm_edid.h > @@ -401,8 +401,8 @@ drm_hdmi_vendor_infoframe_from_display_mode(struct > hdmi_vendor_infoframe *frame, > 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, > -- > 2.33.1 -- Ville Syrjälä Intel
