Commit 797b2fb8 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/disp/g84-: port OR HDMI control to nvkm_ior 



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

drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c

+1 −3
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ g84_disp = { 
	.outp.external.tmds = nv50_pior_output_new,

	.outp.external.dp = nv50_pior_dp_new,

	.dac = { .nr = 3, .new = nv50_dac_new },

	.sor.nr = 2,

	.sor.new = g84_sor_new,

	.sor.hdmi = g84_hdmi_ctrl,

	.sor = { .nr = 2, .new = g84_sor_new },

	.pior = { .nr = 3, .new = nv50_pior_new },

};

drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c

+1 −3
Original line number Diff line number Diff line
@@ -40,9 +40,7 @@ g94_disp = { 
	.outp.external.tmds = nv50_pior_output_new,

	.outp.external.dp = nv50_pior_dp_new,

	.dac = { .nr = 3, .new = nv50_dac_new },

	.sor.nr = 4,

	.sor.new = g94_sor_new,

	.sor.hdmi = g84_hdmi_ctrl,

	.sor = { .nr = 4, .new = g94_sor_new },

	.pior = { .nr = 3, .new = nv50_pior_new },

};

drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c

+0 −1
Original line number Diff line number Diff line
@@ -510,7 +510,6 @@ gf119_disp = { 
	.sor.nr = 4,

	.sor.new = gf119_sor_new,

	.sor.hda_eld = gf119_hda_eld,

	.sor.hdmi = gf119_hdmi_ctrl,

};



int

drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ gk104_disp = { 
	.sor.nr = 4,

	.sor.new = gk104_sor_new,

	.sor.hda_eld = gf119_hda_eld,

	.sor.hdmi = gk104_hdmi_ctrl,

};



int

drivers/gpu/drm/nouveau/nvkm/engine/disp/gk110.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ gk110_disp = { 
	.sor.nr = 4,

	.sor.new = gk104_sor_new,

	.sor.hda_eld = gf119_hda_eld,

	.sor.hdmi = gk104_hdmi_ctrl,

};



int