diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-05-19 16:59:35 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-06-16 07:04:57 +0300 |
| commit | 6c22ea3747fd36409ce4a1e1a0cbac40f93e1e71 (patch) | |
| tree | 3e59368a13cff78bed2206404138b0849b56c69d /drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | |
| parent | 3c66c87dc96b3113b5ee84604800c2aabbb48994 (diff) | |
| download | linux-6c22ea3747fd36409ce4a1e1a0cbac40f93e1e71.tar.xz | |
drm/nouveau/disp: introduce acquire/release display path methods
These exist to give NVKM information on the set of display paths that
the DD needs to be active at any given time.
Previously, the supervisor attempted to determine this solely from OR
state, but there's a few configurations where this information on its
own isn't enough to determine the specific display paths in question:
- ANX9805, where the PIOR protocol for both DP and TMDS is TMDS.
- On a device using DCB Switched Outputs.
- On GM20x and newer, with a crossbar between the SOR and macro links.
After this commit, the DD tells NVKM *exactly* which display path it's
attempting a modeset on.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c index c0d730af4c97..7a8dff7b8c95 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c @@ -306,9 +306,6 @@ gf119_disp_intr_unk2_2(struct nv50_disp *disp, int head) if (nvkm_output_dp_train(outp, pclk)) OUTP_ERR(outp, "link not trained before attach"); - } else { - if (disp->func->sor.magic) - disp->func->sor.magic(outp); } exec_clkcmp(disp, head, 0, pclk, &conf); @@ -377,6 +374,7 @@ gf119_disp_super(struct work_struct *work) nvkm_debug(subdev, "supervisor 2.0 - head %d\n", head->id); gf119_disp_intr_unk2_0(disp, head->id); } + nvkm_outp_route(&disp->base); list_for_each_entry(head, &disp->base.head, head) { if (!(mask[head->id] & 0x00010000)) continue; |