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:49 +1000 |
| commit | 78f1ad6f655847411b36bda2b2acbd0648a03d5c (patch) | |
| tree | 58607006081fa1b89049c381978ee7b59efa1569 /drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c | |
| parent | 57b2d73be275f853066aaf5cc33f6c59a94260b2 (diff) | |
| download | linux-next-78f1ad6f655847411b36bda2b2acbd0648a03d5c.tar.gz | |
drm/nouveau/disp: introduce input/output resource abstraction
In order to properly support the SOR -> SOR + pad macro separation
that occurred with GM20x GPUs, we need to separate OR handling out
of the output path code.
This will be used as the base to support ORs (DAC, SOR, PIOR).
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c index a83684c2c129..aeaaf4280d04 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c @@ -23,6 +23,7 @@ */ #include "nv50.h" #include "head.h" +#include "ior.h" #include "rootnv50.h" static const struct nv50_disp_func @@ -38,9 +39,11 @@ gk104_disp = { .outp.internal.lvds = nv50_sor_output_new, .outp.internal.dp = gf119_sor_dp_new, .dac.nr = 3, + .dac.new = nv50_dac_new, .dac.power = nv50_dac_power, .dac.sense = nv50_dac_sense, .sor.nr = 4, + .sor.new = gf119_sor_new, .sor.power = nv50_sor_power, .sor.hda_eld = gf119_hda_eld, .sor.hdmi = gk104_hdmi_ctrl, |