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:05:03 +1000 |
| commit | f479c0ba4a170aa65cafcfa5c8a4e1d5c35181f2 (patch) | |
| tree | a95e4262b93cd26bb7224462c96918d927558e87 /drivers/gpu/drm/nouveau/nouveau_dp.c | |
| parent | d665c7e91458e19f413ea89d99d89f4743be95e3 (diff) | |
| download | op-kernel-dev-f479c0ba4a170aa65cafcfa5c8a4e1d5c35181f2.zip op-kernel-dev-f479c0ba4a170aa65cafcfa5c8a4e1d5c35181f2.tar.gz | |
drm/nouveau/kms/nv50: initial support for DP 1.2 multi-stream
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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c index ddffb5cd..0d052e1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dp.c +++ b/drivers/gpu/drm/nouveau/nouveau_dp.c @@ -33,6 +33,10 @@ #include <nvif/class.h> #include <nvif/cl5070.h> +MODULE_PARM_DESC(mst, "Enable DisplayPort multi-stream (default: enabled)"); +static int nouveau_mst = 1; +module_param_named(mst, nouveau_mst, int, 0400); + static void nouveau_dp_probe_oui(struct drm_device *dev, struct nvkm_i2c_aux *aux, u8 *dpcd) { @@ -88,7 +92,9 @@ nouveau_dp_detect(struct nouveau_encoder *nv_encoder) nouveau_dp_probe_oui(dev, aux, dpcd); - ret = nv50_mstm_detect(nv_encoder->dp.mstm, dpcd, 0); + ret = nv50_mstm_detect(nv_encoder->dp.mstm, dpcd, nouveau_mst); + if (ret == 1) + return NOUVEAU_DP_MST; if (ret == 0) return NOUVEAU_DP_SST; return ret; |
