Message ID | 20221107194604.15227-3-ville.syrjala@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915: Fix audio/infroframes on g4x | expand |
On Mon, 07 Nov 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > YCbCr output requires infoframes and whatnot, so don't allow > it when dealing with a DVI sink (or a HDMI sink we wishc to > treat as DVI). *wish Reviewed-by: Jani Nikula <jani.nikula@intel.com> > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_hdmi.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c > index f2a4431a7fbf..d3692c9a1d80 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -2190,9 +2190,13 @@ static bool intel_hdmi_has_audio(struct intel_encoder *encoder, > } > > static enum intel_output_format > -intel_hdmi_output_format(struct intel_connector *connector, > +intel_hdmi_output_format(const struct intel_crtc_state *crtc_state, > + struct intel_connector *connector, > bool ycbcr_420_output) > { > + if (!crtc_state->has_hdmi_sink) > + return INTEL_OUTPUT_FORMAT_RGB; > + > if (connector->base.ycbcr_420_allowed && ycbcr_420_output) > return INTEL_OUTPUT_FORMAT_YCBCR420; > else > @@ -2211,7 +2215,8 @@ static int intel_hdmi_compute_output_format(struct intel_encoder *encoder, > bool ycbcr_420_only = drm_mode_is_420_only(info, adjusted_mode); > int ret; > > - crtc_state->output_format = intel_hdmi_output_format(connector, ycbcr_420_only); > + crtc_state->output_format = > + intel_hdmi_output_format(crtc_state, connector, ycbcr_420_only); > > if (ycbcr_420_only && !intel_hdmi_is_ycbcr420(crtc_state)) { > drm_dbg_kms(&i915->drm, > @@ -2226,7 +2231,7 @@ static int intel_hdmi_compute_output_format(struct intel_encoder *encoder, > !drm_mode_is_420_also(info, adjusted_mode)) > return ret; > > - crtc_state->output_format = intel_hdmi_output_format(connector, true); > + crtc_state->output_format = intel_hdmi_output_format(crtc_state, connector, true); > ret = intel_hdmi_compute_clock(encoder, crtc_state, respect_downstream_limits); > }
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index f2a4431a7fbf..d3692c9a1d80 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2190,9 +2190,13 @@ static bool intel_hdmi_has_audio(struct intel_encoder *encoder, } static enum intel_output_format -intel_hdmi_output_format(struct intel_connector *connector, +intel_hdmi_output_format(const struct intel_crtc_state *crtc_state, + struct intel_connector *connector, bool ycbcr_420_output) { + if (!crtc_state->has_hdmi_sink) + return INTEL_OUTPUT_FORMAT_RGB; + if (connector->base.ycbcr_420_allowed && ycbcr_420_output) return INTEL_OUTPUT_FORMAT_YCBCR420; else @@ -2211,7 +2215,8 @@ static int intel_hdmi_compute_output_format(struct intel_encoder *encoder, bool ycbcr_420_only = drm_mode_is_420_only(info, adjusted_mode); int ret; - crtc_state->output_format = intel_hdmi_output_format(connector, ycbcr_420_only); + crtc_state->output_format = + intel_hdmi_output_format(crtc_state, connector, ycbcr_420_only); if (ycbcr_420_only && !intel_hdmi_is_ycbcr420(crtc_state)) { drm_dbg_kms(&i915->drm, @@ -2226,7 +2231,7 @@ static int intel_hdmi_compute_output_format(struct intel_encoder *encoder, !drm_mode_is_420_also(info, adjusted_mode)) return ret; - crtc_state->output_format = intel_hdmi_output_format(connector, true); + crtc_state->output_format = intel_hdmi_output_format(crtc_state, connector, true); ret = intel_hdmi_compute_clock(encoder, crtc_state, respect_downstream_limits); }