diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-11-04 17:20:36 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-11-07 14:04:50 +1000 |
| commit | 52aa30f2524d065c6f251d78e906966fed8291eb (patch) | |
| tree | cfe4ef0804a8f29ced0c164c0224e43ae9508a2b /drivers/gpu/drm/nouveau/nouveau_dp.c | |
| parent | fc21a4a0993a9d8d72facccad3ab6f19d8d706fb (diff) | |
| download | op-kernel-dev-52aa30f2524d065c6f251d78e906966fed8291eb.zip op-kernel-dev-52aa30f2524d065c6f251d78e906966fed8291eb.tar.gz | |
drm/nouveau/kms/nv50: switch mst sink back into sst mode
Sometimes we load with a sink already in MST mode. If, however, we can't
or don't want to use MST, we need to be able to switch it back to SST.
This commit instantiates a stub topology manager for any output path that
we believe (the detection of this could use some improvement) has support
for MST, and adds the connector detect() logic for detecting sink support
and switching between modes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_dp.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_dp.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c index 87d52d3..399eb9d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dp.c +++ b/drivers/gpu/drm/nouveau/nouveau_dp.c @@ -30,6 +30,9 @@ #include "nouveau_encoder.h" #include "nouveau_crtc.h" +#include <nvif/class.h> +#include <nvif/cl5070.h> + static void nouveau_dp_probe_oui(struct drm_device *dev, struct nvkm_i2c_aux *aux, u8 *dpcd) { @@ -84,5 +87,9 @@ nouveau_dp_detect(struct nouveau_encoder *nv_encoder) nv_encoder->dp.link_nr, nv_encoder->dp.link_bw); nouveau_dp_probe_oui(dev, aux, dpcd); - return 0; + + ret = nv50_mstm_detect(nv_encoder->dp.mstm, dpcd, 0); + if (ret == 0) + return NOUVEAU_DP_SST; + return ret; } |
