Commit 8ed09421 authored by Ben Skeggs's avatar Ben Skeggs Committed by Lyude Paul
Browse files

drm/nouveau/disp: move hdmi disable out of release() 



- release() is being moved post-modeset, preserve hdmi behaviour for now

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Acked-by: default avatarDanilo Krummrich <me@dakr.org>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230919220442.202488-21-lyude@redhat.com
parent 6c6abab2

drivers/gpu/drm/nouveau/dispnv50/disp.c

+8 −0
Original line number Diff line number Diff line
@@ -842,6 +842,8 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc, 
		size = 0;



	nvif_outp_infoframe(&nv_encoder->outp, NVIF_OUTP_INFOFRAME_V0_VSI, &args.infoframe, size);



	nv_encoder->hdmi.enabled = true;

}



/******************************************************************************
@@ -1562,6 +1564,12 @@ nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *st 
	}

#endif



	if (nv_encoder->dcb->type == DCB_OUTPUT_TMDS && nv_encoder->hdmi.enabled) {

		nvif_outp_hdmi(&nv_encoder->outp, nv_crtc->index,

			       false, 0, 0, 0, false, false, false);

		nv_encoder->hdmi.enabled = false;

	}



	if (nv_encoder->dcb->type == DCB_OUTPUT_DP) {

		ret = drm_dp_dpcd_readb(aux, DP_SET_POWER, &pwr);

drivers/gpu/drm/nouveau/nouveau_encoder.h

+5 −1
Original line number Diff line number Diff line
@@ -69,7 +69,11 @@ struct nouveau_encoder { 


	struct nv04_output_reg restore;



	union {

	struct {

		struct {

			bool enabled;

		} hdmi;



		struct {

			struct nv50_mstm *mstm;

			int link_nr;

drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c

+7 −8
Original line number Diff line number Diff line
@@ -154,6 +154,13 @@ nvkm_uoutp_mthd_hdmi(struct nvkm_outp *outp, void *argv, u32 argc) 
	    (args->v0.scdc && !ior->func->hdmi->scdc))

		return -EINVAL;



	if (!args->v0.enable) {

		ior->func->hdmi->infoframe_avi(ior, args->v0.head, NULL, 0);

		ior->func->hdmi->infoframe_vsi(ior, args->v0.head, NULL, 0);

		ior->func->hdmi->ctrl(ior, args->v0.head, false, 0, 0);

		return 0;

	}



	ior->func->hdmi->ctrl(ior, args->v0.head, args->v0.enable,

			      args->v0.max_ac_packet, args->v0.rekey);

	if (ior->func->hdmi->scdc)
@@ -177,19 +184,11 @@ nvkm_uoutp_mthd_acquire_lvds(struct nvkm_outp *outp, bool dual, bool bpc8) 
static int

nvkm_uoutp_mthd_release(struct nvkm_outp *outp, void *argv, u32 argc)

{

	struct nvkm_head *head = outp->asy.head;

	struct nvkm_ior *ior = outp->ior;

	union nvif_outp_release_args *args = argv;



	if (argc != sizeof(args->vn))

		return -ENOSYS;



	if (ior->func->hdmi && head) {

		ior->func->hdmi->infoframe_avi(ior, head->id, NULL, 0);

		ior->func->hdmi->infoframe_vsi(ior, head->id, NULL, 0);

		ior->func->hdmi->ctrl(ior, head->id, false, 0, 0);

	}



	nvkm_outp_release(outp);

	return 0;

}