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

Commit f5cb8ab1 authored by Patrice Mandin's avatar Patrice Mandin Committed by Ben Skeggs
Browse files

drm/nv30: Apply modesetting to the correct slave encoder 



Signed-off-by: default avatarPatrice Mandin <patmandin@gmail.com>
Reviewed-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent acae116c

drivers/gpu/drm/nouveau/nv04_dfp.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -444,6 +444,7 @@ static void nv04_dfp_commit(struct drm_encoder *encoder) 
	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct dcb_entry *dcbe = nv_encoder->dcb;

	struct dcb_entry *dcbe = nv_encoder->dcb;

	int head = nouveau_crtc(encoder->crtc)->index;

	int head = nouveau_crtc(encoder->crtc)->index;

	struct drm_encoder *slave_encoder;





	if (dcbe->type == OUTPUT_TMDS)

	if (dcbe->type == OUTPUT_TMDS)

		run_tmds_table(dev, dcbe, head, nv_encoder->mode.clock);

		run_tmds_table(dev, dcbe, head, nv_encoder->mode.clock);
@@ -462,9 +463,10 @@ static void nv04_dfp_commit(struct drm_encoder *encoder) 
		NVWriteRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + nv04_dac_output_offset(encoder), 0x00100000);

		NVWriteRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + nv04_dac_output_offset(encoder), 0x00100000);





	/* Init external transmitters */

	/* Init external transmitters */

	if (get_tmds_slave(encoder))

	slave_encoder = get_tmds_slave(encoder);

		get_slave_funcs(get_tmds_slave(encoder))->mode_set(

	if (slave_encoder)

			encoder, &nv_encoder->mode, &nv_encoder->mode);

		get_slave_funcs(slave_encoder)->mode_set(

			slave_encoder, &nv_encoder->mode, &nv_encoder->mode);





	helper->dpms(encoder, DRM_MODE_DPMS_ON);

	helper->dpms(encoder, DRM_MODE_DPMS_ON);