diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-05-13 09:51:01 +1000 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-05-14 11:46:47 -0400 |
| commit | bed447e7d1bd2d32d3fb09b4de0d0d5a23d3f82b (patch) | |
| tree | 8458df8b1eb45ade8a67b7db4cd0d7e0d2f90e5c /drivers/gpu | |
| parent | fcf3b54282e4c5a95a1f45f67558bc105acdbc6a (diff) | |
| download | linux-bed447e7d1bd2d32d3fb09b4de0d0d5a23d3f82b.tar.bz2 | |
drm/radeon: don't do mst probing if MST isn't enabled.
This causes an oops as we haven't initialised the mst
layer.
Reported-by: Dave Jones <<davej@codemonkey.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_dp_mst.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c index 1017338a49d9..2b98ed3e684d 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c @@ -666,6 +666,9 @@ radeon_dp_mst_probe(struct radeon_connector *radeon_connector) int ret; u8 msg[1]; + if (!radeon_mst) + return 0; + if (dig_connector->dpcd[DP_DPCD_REV] < 0x12) return 0; |