diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2017-05-19 23:59:35 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2017-06-16 14:04:54 +1000 |
commit | 0df182466265d39591d742839f1014f93b7cbd02 (patch) | |
tree | a83c4097c94753b0d5ac4f767c75c45df79f90d0 /drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c | |
parent | 9c5753bc708da0c2c544fcfe1e94afb399c2b3f6 (diff) | |
download | linux-0df182466265d39591d742839f1014f93b7cbd02.tar.bz2 |
drm/nouveau/disp/nv50-: port OR manual sink detection to nvkm_ior
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c | 4 |
1 files changed, 1 insertions, 3 deletions
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, |