[Intel-gfx] [PATCH 03/13] drm/i915/dp: stop caching has_audio in struct intel_dp

[Nautiyal, Ankit K]

LGTM.

Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>

On 4/21/2023 5:17 PM, Jani Nikula wrote:
> Use the information stored in display info.
>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_display_debugfs.c | 2 +-
>   drivers/gpu/drm/i915/display/intel_display_types.h   | 1 -
>   drivers/gpu/drm/i915/display/intel_dp.c              | 5 ++---
>   3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index 77caed2552d0..1416b82fc8a3 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -237,7 +237,7 @@ static void intel_dp_info(struct seq_file *m,
>   
>   	seq_printf(m, "\tDPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]);
>   	seq_printf(m, "\taudio support: %s\n",
> -		   str_yes_no(intel_dp->has_audio));
> +		   str_yes_no(intel_connector->base.display_info.has_audio));
>   
>   	drm_dp_downstream_debug(m, intel_dp->dpcd, intel_dp->downstream_ports,
>   				edid ? edid->data : NULL, &intel_dp->aux);
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 35c260bd1461..9c9b771cbcbd 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -1670,7 +1670,6 @@ struct intel_dp {
>   	u8 sink_count;
>   	bool link_trained;
>   	bool has_hdmi_sink;
> -	bool has_audio;
>   	bool reset_link_params;
>   	bool use_max_params;
>   	u8 dpcd[DP_RECEIVER_CAP_SIZE];
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 1d28a2560ae0..cda69861b00a 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -2077,6 +2077,7 @@ static bool intel_dp_has_audio(struct intel_encoder *encoder,
>   {
>   	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
>   	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> +	struct intel_connector *connector = intel_dp->attached_connector;
>   	const struct intel_digital_connector_state *intel_conn_state =
>   		to_intel_digital_connector_state(conn_state);
>   
> @@ -2084,7 +2085,7 @@ static bool intel_dp_has_audio(struct intel_encoder *encoder,
>   		return false;
>   
>   	if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
> -		return intel_dp->has_audio;
> +		return connector->base.display_info.has_audio;
>   	else
>   		return intel_conn_state->force_audio == HDMI_AUDIO_ON;
>   }
> @@ -4712,7 +4713,6 @@ intel_dp_set_edid(struct intel_dp *intel_dp)
>   	edid = drm_edid_raw(drm_edid);
>   	if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {
>   		intel_dp->has_hdmi_sink = drm_detect_hdmi_monitor(edid);
> -		intel_dp->has_audio = drm_detect_monitor_audio(edid);
>   	}
>   
>   	drm_dp_cec_set_edid(&intel_dp->aux, edid);
> @@ -4728,7 +4728,6 @@ intel_dp_unset_edid(struct intel_dp *intel_dp)
>   	connector->detect_edid = NULL;
>   
>   	intel_dp->has_hdmi_sink = false;
> -	intel_dp->has_audio = false;
>   
>   	intel_dp->dfp.max_bpc = 0;
>   	intel_dp->dfp.max_dotclock = 0;