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:55 +1000 |
| commit | 7dc0bac4aabb62a91543a29782ce12955708bfe2 (patch) | |
| tree | 42b9673226574767bfebc79c786e13c1063ed1c5 /drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | |
| parent | 333781045d84628417efa161d37256331abef64b (diff) | |
drm/nouveau/disp/g94-: port OR DP link setup to nvkm_ior
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c index f3b255027c11..979563434da8 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c @@ -240,11 +240,13 @@ nvkm_dp_train_links(struct nvkm_dp *dp) nvbios_exec(&init); } - ret = dp->func->lnk_ctl(dp, ior->dp.nr, ior->dp.bw, ior->dp.ef); + ret = ior->func->dp.links(ior, dp->aux); if (ret) { - if (ret < 0) - OUTP_ERR(&dp->outp, "lnk_ctl failed with %d", ret); - return ret; + if (ret < 0) { + OUTP_ERR(&dp->outp, "train failed with %d", ret); + return ret; + } + return 0; } dp->func->lnk_pwr(dp, ior->dp.nr); |