Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ae494e8 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv50/disp: disconnect encoders before reprogramming them 



Fixes a case where we don't get separate supervisor interrupt sequences for
disconnect and modeset events.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0f6ea564

drivers/gpu/drm/nouveau/nv50_dac.c

+1 −6
Original line number Diff line number Diff line
@@ -199,11 +199,6 @@ nv50_dac_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode, 
	return true;

}



static void

nv50_dac_prepare(struct drm_encoder *encoder)

{

}



static void

nv50_dac_commit(struct drm_encoder *encoder)

{
@@ -266,7 +261,7 @@ static const struct drm_encoder_helper_funcs nv50_dac_helper_funcs = { 
	.save = nv50_dac_save,

	.restore = nv50_dac_restore,

	.mode_fixup = nv50_dac_mode_fixup,

	.prepare = nv50_dac_prepare,

	.prepare = nv50_dac_disconnect,

	.commit = nv50_dac_commit,

	.mode_set = nv50_dac_mode_set,

	.get_crtc = nv50_dac_crtc_get,

drivers/gpu/drm/nouveau/nv50_sor.c

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ nv50_sor_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode, 
static void

nv50_sor_prepare(struct drm_encoder *encoder)

{

	nv50_sor_disconnect(encoder);

}



static void