From 0df182466265d39591d742839f1014f93b7cbd02 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 19 May 2017 23:59:35 +1000 Subject: drm/nouveau/disp/nv50-: port OR manual sink detection to nvkm_ior Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c') diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c index efbbbff0b93f..2f84b1b5a469 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c @@ -38,9 +38,7 @@ gk104_disp = { .outp.internal.tmds = nv50_sor_output_new, .outp.internal.lvds = nv50_sor_output_new, .outp.internal.dp = gf119_sor_dp_new, - .dac.nr = 3, - .dac.new = gf119_dac_new, - .dac.sense = nv50_dac_sense, + .dac = { .nr = 3, .new = gf119_dac_new }, .sor.nr = 4, .sor.new = gk104_sor_new, .sor.hda_eld = gf119_hda_eld, -- cgit