Re: [RESEND 1/6] drm/nouveau: convert to using is_hdmi and has_audio from display info

[Jani Nikula <jani.nikula@intel.com>]

On Fri, 10 May 2024, Lyude Paul <lyude@redhat.com> wrote:
> Reviewed-by: Lyude Paul <lyude@redhat.com>

Thanks, how do you want to handle merging this?

BR,
Jani.


>
> On Fri, 2024-05-10 at 18:08 +0300, Jani Nikula wrote:
>> Prefer the parsed results for is_hdmi and has_audio in display info
>> over
>> calling drm_detect_hdmi_monitor() and drm_detect_monitor_audio(),
>> respectively.
>> 
>> Conveniently, this also removes the need to use edid_blob_ptr.
>> 
>> v2: Reverse a backwards if condition (Ilia)
>> 
>> Cc: Karol Herbst <kherbst@redhat.com>
>> Cc: Lyude Paul <lyude@redhat.com>
>> Cc: Danilo Krummrich <dakr@redhat.com>
>> Cc: nouveau@lists.freedesktop.org
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>  drivers/gpu/drm/nouveau/dispnv50/disp.c     | 8 ++++----
>>  drivers/gpu/drm/nouveau/dispnv50/head.c     | 8 +-------
>>  drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +-
>>  3 files changed, 6 insertions(+), 12 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c
>> b/drivers/gpu/drm/nouveau/dispnv50/disp.c
>> index 0c3d88ad0b0e..168c27213287 100644
>> --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
>> +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
>> @@ -751,7 +751,7 @@ nv50_audio_enable(struct drm_encoder *encoder,
>> struct nouveau_crtc *nv_crtc,
>>  	struct nouveau_encoder *nv_encoder =
>> nouveau_encoder(encoder);
>>  	struct nvif_outp *outp = &nv_encoder->outp;
>>  
>> -	if (!nv50_audio_supported(encoder) ||
>> !drm_detect_monitor_audio(nv_connector->edid))
>> +	if (!nv50_audio_supported(encoder) || !nv_connector-
>> >base.display_info.has_audio)
>>  		return;
>>  
>>  	mutex_lock(&drm->audio.lock);
>> @@ -1765,7 +1765,7 @@ nv50_sor_atomic_enable(struct drm_encoder
>> *encoder, struct drm_atomic_state *sta
>>  	if ((disp->disp->object.oclass == GT214_DISP ||
>>  	     disp->disp->object.oclass >= GF110_DISP) &&
>>  	    nv_encoder->dcb->type != DCB_OUTPUT_LVDS &&
>> -	    drm_detect_monitor_audio(nv_connector->edid))
>> +	    nv_connector->base.display_info.has_audio)
>>  		hda = true;
>>  
>>  	if (!nvif_outp_acquired(outp))
>> @@ -1774,7 +1774,7 @@ nv50_sor_atomic_enable(struct drm_encoder
>> *encoder, struct drm_atomic_state *sta
>>  	switch (nv_encoder->dcb->type) {
>>  	case DCB_OUTPUT_TMDS:
>>  		if (disp->disp->object.oclass != NV50_DISP &&
>> -		    drm_detect_hdmi_monitor(nv_connector->edid))
>> +		    nv_connector->base.display_info.is_hdmi)
>>  			nv50_hdmi_enable(encoder, nv_crtc,
>> nv_connector, state, mode, hda);
>>  
>>  		if (nv_encoder->outp.or.link & 1) {
>> @@ -1787,7 +1787,7 @@ nv50_sor_atomic_enable(struct drm_encoder
>> *encoder, struct drm_atomic_state *sta
>>  			 */
>>  			if (mode->clock >= 165000 &&
>>  			    nv_encoder->dcb->duallink_possible &&
>> -			    !drm_detect_hdmi_monitor(nv_connector-
>> >edid))
>> +			    !nv_connector-
>> >base.display_info.is_hdmi)
>>  				proto =
>> NV507D_SOR_SET_CONTROL_PROTOCOL_DUAL_TMDS;
>>  		} else {
>>  			proto =
>> NV507D_SOR_SET_CONTROL_PROTOCOL_SINGLE_TMDS_B;
>> diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c
>> b/drivers/gpu/drm/nouveau/dispnv50/head.c
>> index 83355dbc15ee..d7c74cc43ba5 100644
>> --- a/drivers/gpu/drm/nouveau/dispnv50/head.c
>> +++ b/drivers/gpu/drm/nouveau/dispnv50/head.c
>> @@ -127,14 +127,8 @@ nv50_head_atomic_check_view(struct
>> nv50_head_atom *armh,
>>  	struct drm_display_mode *omode = &asyh->state.adjusted_mode;
>>  	struct drm_display_mode *umode = &asyh->state.mode;
>>  	int mode = asyc->scaler.mode;
>> -	struct edid *edid;
>>  	int umode_vdisplay, omode_hdisplay, omode_vdisplay;
>>  
>> -	if (connector->edid_blob_ptr)
>> -		edid = (struct edid *)connector->edid_blob_ptr-
>> >data;
>> -	else
>> -		edid = NULL;
>> -
>>  	if (!asyc->scaler.full) {
>>  		if (mode == DRM_MODE_SCALE_NONE)
>>  			omode = umode;
>> @@ -162,7 +156,7 @@ nv50_head_atomic_check_view(struct nv50_head_atom
>> *armh,
>>  	 */
>>  	if ((asyc->scaler.underscan.mode == UNDERSCAN_ON ||
>>  	    (asyc->scaler.underscan.mode == UNDERSCAN_AUTO &&
>> -	     drm_detect_hdmi_monitor(edid)))) {
>> +	     connector->display_info.is_hdmi))) {
>>  		u32 bX = asyc->scaler.underscan.hborder;
>>  		u32 bY = asyc->scaler.underscan.vborder;
>>  		u32 r = (asyh->view.oH << 19) / asyh->view.oW;
>> diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c
>> b/drivers/gpu/drm/nouveau/nouveau_connector.c
>> index 856b3ef5edb8..938832a6af15 100644
>> --- a/drivers/gpu/drm/nouveau/nouveau_connector.c
>> +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
>> @@ -1034,7 +1034,7 @@ get_tmds_link_bandwidth(struct drm_connector
>> *connector)
>>  	unsigned duallink_scale =
>>  		nouveau_duallink && nv_encoder->dcb-
>> >duallink_possible ? 2 : 1;
>>  
>> -	if (drm_detect_hdmi_monitor(nv_connector->edid)) {
>> +	if (nv_connector->base.display_info.is_hdmi) {
>>  		info = &nv_connector->base.display_info;
>>  		duallink_scale = 1;
>>  	}

-- 
Jani Nikula, Intel