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

drm/nouveau/kms/gv100-: Add support for interlaced modes 



We advertise being able to set interlaced modes, so let's actually make
sure to do that. Otherwise, we'll end up hanging the display engine due
to trying to set a mode with timings adjusted for interlacing without
telling the hardware it's actually an interlaced mode.

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

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

+3 −2
Original line number Diff line number Diff line
@@ -168,14 +168,15 @@ headc37d_mode(struct nv50_head *head, struct nv50_head_atom *asyh) 
	struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;

	struct nv50_head_mode *m = &asyh->mode;

	u32 *push;

	if ((push = evo_wait(core, 12))) {

	if ((push = evo_wait(core, 13))) {

		evo_mthd(push, 0x2064 + (head->base.index * 0x400), 5);

		evo_data(push, (m->v.active  << 16) | m->h.active );

		evo_data(push, (m->v.synce   << 16) | m->h.synce  );

		evo_data(push, (m->v.blanke  << 16) | m->h.blanke );

		evo_data(push, (m->v.blanks  << 16) | m->h.blanks );

		evo_data(push, (m->v.blank2e << 16) | m->v.blank2s);

		evo_mthd(push, 0x200c + (head->base.index * 0x400), 1);

		evo_mthd(push, 0x2008 + (head->base.index * 0x400), 2);

		evo_data(push, m->interlace);

		evo_data(push, m->clock * 1000);

		evo_mthd(push, 0x2028 + (head->base.index * 0x400), 1);

		evo_data(push, m->clock * 1000);

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

+3 −2
Original line number Diff line number Diff line
@@ -173,14 +173,15 @@ headc57d_mode(struct nv50_head *head, struct nv50_head_atom *asyh) 
	struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;

	struct nv50_head_mode *m = &asyh->mode;

	u32 *push;

	if ((push = evo_wait(core, 12))) {

	if ((push = evo_wait(core, 13))) {

		evo_mthd(push, 0x2064 + (head->base.index * 0x400), 5);

		evo_data(push, (m->v.active  << 16) | m->h.active );

		evo_data(push, (m->v.synce   << 16) | m->h.synce  );

		evo_data(push, (m->v.blanke  << 16) | m->h.blanke );

		evo_data(push, (m->v.blanks  << 16) | m->h.blanks );

		evo_data(push, (m->v.blank2e << 16) | m->v.blank2s);

		evo_mthd(push, 0x200c + (head->base.index * 0x400), 1);

		evo_mthd(push, 0x2008 + (head->base.index * 0x400), 2);

		evo_data(push, m->interlace);

		evo_data(push, m->clock * 1000);

		evo_mthd(push, 0x2028 + (head->base.index * 0x400), 1);

		evo_data(push, m->clock * 1000);

CRA Git | Maintained and supported by SUSTech CRA and CCSE