Commit 1958d69f authored by Ben Skeggs's avatar Ben Skeggs Committed by Lyude Paul
Browse files

drm/nouveau/disp: add dp mst id get/put methods 



- preparation for GSP-RM

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-36-lyude@redhat.com
parent e206cae1

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

+28 −4
Original line number Diff line number Diff line
@@ -869,6 +869,8 @@ struct nv50_msto { 
	struct nv50_mstc *mstc;

	bool disabled;

	bool enabled;



	u32 display_id;

};



struct nouveau_encoder *nv50_real_outp(struct drm_encoder *encoder)
@@ -897,10 +899,17 @@ nv50_msto_cleanup(struct drm_atomic_state *state, 
		drm_atomic_get_old_mst_topology_state(state, mgr);

	const struct drm_dp_mst_atomic_payload *old_payload =

		drm_atomic_get_mst_payload_state(old_mst_state, msto->mstc->port);

	struct nv50_mstc *mstc = msto->mstc;

	struct nv50_mstm *mstm = mstc->mstm;



	NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);



	if (msto->disabled) {

		if (msto->head->func->display_id) {

			nvif_outp_dp_mst_id_put(&mstm->outp->outp, msto->display_id);

			msto->display_id = 0;

		}



		msto->mstc = NULL;

		msto->disabled = false;

		drm_dp_remove_payload_part2(mgr, new_mst_state, old_payload, new_payload);
@@ -1041,6 +1050,11 @@ nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *st 
		nouveau_dp_train(mstm->outp, true, 0, 0);

	}



	if (head->func->display_id) {

		if (!WARN_ON(nvif_outp_dp_mst_id_get(&mstm->outp->outp, &msto->display_id)))

			head->func->display_id(head, msto->display_id);

	}



	if (mstm->outp->outp.or.link & 1)

		proto = NV917D_SOR_SET_CONTROL_PROTOCOL_DP_A;

	else
@@ -1061,6 +1075,9 @@ nv50_msto_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *s 
	struct nv50_mstc *mstc = msto->mstc;

	struct nv50_mstm *mstm = mstc->mstm;



	if (msto->head->func->display_id)

		msto->head->func->display_id(msto->head, 0);



	mstm->outp->update(mstm->outp, msto->head->base.index, NULL, 0, 0);

	mstm->modified = true;

	if (!--mstm->links)
@@ -1544,7 +1561,7 @@ static void 
nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(nv_encoder->crtc);

	struct nv50_head *head = nv50_head(nv_encoder->crtc);

	struct nouveau_connector *nv_connector = nv50_outp_get_old_connector(state, nv_encoder);

#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT

	struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev);
@@ -1563,7 +1580,7 @@ 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,

		nvif_outp_hdmi(&nv_encoder->outp, head->base.index,

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

		nv_encoder->hdmi.enabled = false;

	}
@@ -1571,8 +1588,11 @@ nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *st 
	if (nv_encoder->dcb->type == DCB_OUTPUT_DP)

		nouveau_dp_power_down(nv_encoder);



	nv_encoder->update(nv_encoder, nv_crtc->index, NULL, 0, 0);

	nv50_audio_disable(encoder, nv_crtc);

	if (head->func->display_id)

		head->func->display_id(head, 0);



	nv_encoder->update(nv_encoder, head->base.index, NULL, 0, 0);

	nv50_audio_disable(encoder, &head->base);

	nv_encoder->crtc = NULL;

}
@@ -1585,6 +1605,7 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *sta 
		nv50_head_atom(drm_atomic_get_new_crtc_state(state, &nv_crtc->base));

	struct drm_display_mode *mode = &asyh->state.adjusted_mode;

	struct nv50_disp *disp = nv50_disp(encoder->dev);

	struct nv50_head *head = nv50_head(&nv_crtc->base);

	struct nvif_outp *outp = &nv_encoder->outp;

	struct drm_device *dev = encoder->dev;

	struct nouveau_drm *drm = nouveau_drm(dev);
@@ -1682,6 +1703,9 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *sta 
		break;

	}



	if (head->func->display_id)

		head->func->display_id(head, BIT(nv_encoder->dcb->id));



	nv_encoder->update(nv_encoder, nv_crtc->index, asyh, proto, depth);

}

drivers/gpu/drm/nouveau/dispnv50/head.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct nv50_head_func { 
	int (*procamp)(struct nv50_head *, struct nv50_head_atom *);

	int (*or)(struct nv50_head *, struct nv50_head_atom *);

	void (*static_wndw_map)(struct nv50_head *, struct nv50_head_atom *);

	int (*display_id)(struct nv50_head *, u32 display_id);

};



extern const struct nv50_head_func head507d;

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

+14 −0
Original line number Diff line number Diff line
@@ -27,6 +27,19 @@ 


#include <nvhw/class/clc57d.h>



static int

headc57d_display_id(struct nv50_head *head, u32 display_id)

{

	struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))

		return ret;



	PUSH_NVSQ(push, NVC57D, 0x2020 + (head->base.index * 0x400), display_id);

	return 0;

}



static int

headc57d_or(struct nv50_head *head, struct nv50_head_atom *asyh)

{
@@ -250,4 +263,5 @@ headc57d = { 
	.or = headc57d_or,

	/* TODO: flexible window mappings */

	.static_wndw_map = headc37d_static_wndw_map,

	.display_id = headc57d_display_id,

};

drivers/gpu/drm/nouveau/include/nvif/if0012.h

+18 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ union nvif_outp_args { 
#define NVIF_OUTP_V0_DP_TRAIN      0x73

#define NVIF_OUTP_V0_DP_DRIVE      0x74

#define NVIF_OUTP_V0_DP_SST        0x75

#define NVIF_OUTP_V0_DP_MST_ID_GET 0x76

#define NVIF_OUTP_V0_DP_MST_ID_PUT 0x77

#define NVIF_OUTP_V0_DP_MST_VCPI   0x78



union nvif_outp_detect_args {
@@ -234,6 +236,22 @@ union nvif_outp_dp_sst_args { 
	} v0;

};



union nvif_outp_dp_mst_id_put_args {

	struct nvif_outp_dp_mst_id_put_v0 {

		__u8  version;

		__u8  pad01[3];

		__u32 id;

	} v0;

};



union nvif_outp_dp_mst_id_get_args {

	struct nvif_outp_dp_mst_id_get_v0 {

		__u8  version;

		__u8  pad01[3];

		__u32 id;

	} v0;

};



union nvif_outp_dp_mst_vcpi_args {

	struct nvif_outp_dp_mst_vcpi_v0 {

		__u8  version;

drivers/gpu/drm/nouveau/include/nvif/outp.h

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ int nvif_outp_dp_train(struct nvif_outp *, u8 dpcd[DP_RECEIVER_CAP_SIZE], 
		       bool retrain);

int nvif_outp_dp_drive(struct nvif_outp *, u8 link_nr, u8 pe[4], u8 vs[4]);

int nvif_outp_dp_sst(struct nvif_outp *, int head, u32 watermark, u32 hblanksym, u32 vblanksym);

int nvif_outp_dp_mst_id_get(struct nvif_outp *, u32 *id);

int nvif_outp_dp_mst_id_put(struct nvif_outp *, u32 id);

int nvif_outp_dp_mst_vcpi(struct nvif_outp *, int head,

			  u8 start_slot, u8 num_slots, u16 pbn, u16 aligned_pbn);

#endif