diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-02-20 11:14:03 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-02-20 11:14:03 +0100 |
| commit | 7cd972a85705341dd8306eefc558ed9e5def05d7 (patch) | |
| tree | e9ebc6a58a18db80c346c2ecc9def9ea8b9b818b | |
| parent | 8de6f7b2f476d3baa9c7e2bb3544e4bafaad46b7 (diff) | |
return immediately in preinit when called with PROBE_DETECT
This fixes a crash with Xorg -configure.
Bug:
https://bugs.launchpad.net/ubuntu/+source/xorg/+bug/1278046
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | src/radeon_kms.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 21a420f3..4a6c38e8 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -781,6 +781,9 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags) uint32_t tiling = 0; int cpp; + if (flags & PROBE_DETECT) + return TRUE; + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "RADEONPreInit_KMS\n"); if (pScrn->numEntities != 1) return FALSE; |