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

drm/nouveau/kms/nv50-: flush mst disables together 



- fixes some issues tearing down modes on tiled displays

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-31-lyude@redhat.com
parent a5a7379f

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

+1 −10
Original line number Diff line number Diff line
@@ -2084,13 +2084,6 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state) 
			help->atomic_disable(encoder, state);

			outp->disabled = true;

			interlock[NV50_DISP_INTERLOCK_CORE] |= 1;

			if (outp->flush_disable) {

				nv50_disp_atomic_commit_wndw(state, interlock);

				nv50_disp_atomic_commit_core(state, interlock);

				memset(interlock, 0x00, sizeof(interlock));



				flushed = true;

			}

		}

	}
@@ -2376,10 +2369,8 @@ nv50_disp_outp_atomic_check_clr(struct nv50_atom *atom, 
			return PTR_ERR(outp);



		if (outp->encoder->encoder_type == DRM_MODE_ENCODER_DPMST ||

		    nouveau_encoder(outp->encoder)->dcb->type == DCB_OUTPUT_DP) {

			outp->flush_disable = true;

		    nouveau_encoder(outp->encoder)->dcb->type == DCB_OUTPUT_DP)

			atom->flush_disable = true;

		}

		outp->clr.ctrl = true;

		atom->lock_core = true;

	}

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

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ struct nv50_outp_atom { 
	struct list_head head;



	struct drm_encoder *encoder;

	bool flush_disable;



	bool disabled;

	bool enabled;