diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-11-04 08:20:35 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-11-07 05:04:42 +0100 |
| commit | f2a4051379f8f4de418be074ccca77a6aae02f65 (patch) | |
| tree | ee25245045db515eef4ced8ae9472be2fb63d7c4 /drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | |
| parent | drm/nouveau/disp/dp: remove workqueue for link training (diff) | |
| download | linux-f2a4051379f8f4de418be074ccca77a6aae02f65.tar.xz linux-f2a4051379f8f4de418be074ccca77a6aae02f65.zip | |
drm/nouveau/disp/sor/gf119-: add method to control mst enable
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 | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c index 0face69d6302..fd9424101a65 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c @@ -203,17 +203,19 @@ gf119_disp_intr_unk2_0(struct nv50_disp *disp, int head) /* see note in nv50_disp_intr_unk20_0() */ if (outp && outp->info.type == DCB_OUTPUT_DP) { struct nvkm_output_dp *outpdp = nvkm_output_dp(outp); - struct nvbios_init init = { - .subdev = subdev, - .bios = subdev->device->bios, - .outp = &outp->info, - .crtc = head, - .offset = outpdp->info.script[4], - .execute = 1, - }; + if (!outpdp->lt.mst) { + struct nvbios_init init = { + .subdev = subdev, + .bios = subdev->device->bios, + .outp = &outp->info, + .crtc = head, + .offset = outpdp->info.script[4], + .execute = 1, + }; - nvbios_exec(&init); - atomic_set(&outpdp->lt.done, 0); + nvbios_exec(&init); + atomic_set(&outpdp->lt.done, 0); + } } } |