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

drm/nouveau/kms/nv50-: s/armh/asyh/ in nv50_msto_atomic_enable() 



I have a strange dejavu feeling that I tried to submit a patch for this in
the past, but that it was rejected. I can't remember though, but I'm
further convinced this patch is the right thing to do anyway.

We label the to-be-committed head state in nv50_msto_atomic_enable() as
armh. Normally armh implies a state which is currently armed in hardware.
nv50_msto_atomic_enable() is called _after_ drm_atomic_swap_state()
however, but before the commit tail ends, which means that said state is
not actually armed on hardware.

As well - take note that this is the same convention followed in all of the
other atomic_enable() callbacks.

So, let's correct this to asyh.

Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent fa9f9489

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

+4 −5
Original line number Diff line number Diff line
@@ -1072,7 +1072,7 @@ static void 
nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *state)

{

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

	struct nv50_head_atom *armh = nv50_head_atom(head->base.base.state);

	struct nv50_head_atom *asyh = nv50_head_atom(head->base.base.state);

	struct nv50_msto *msto = nv50_msto(encoder);

	struct nv50_mstc *mstc = NULL;

	struct nv50_mstm *mstm = NULL;
@@ -1094,8 +1094,7 @@ nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *st 
	if (WARN_ON(!mstc))

		return;



	r = drm_dp_mst_allocate_vcpi(&mstm->mgr, mstc->port, armh->dp.pbn,

				     armh->dp.tu);

	r = drm_dp_mst_allocate_vcpi(&mstm->mgr, mstc->port, asyh->dp.pbn, asyh->dp.tu);

	if (!r)

		DRM_DEBUG_KMS("Failed to allocate VCPI\n");
@@ -1107,8 +1106,8 @@ nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *st 
	else

		proto = NV917D_SOR_SET_CONTROL_PROTOCOL_DP_B;



	mstm->outp->update(mstm->outp, head->base.index, armh, proto,

			   nv50_dp_bpc_to_depth(armh->or.bpc));

	mstm->outp->update(mstm->outp, head->base.index, asyh, proto,

			   nv50_dp_bpc_to_depth(asyh->or.bpc));



	msto->mstc = mstc;

	mstm->modified = true;