[PATCH xf86-video-ati] return immediately in preinit when called with PROBE_DETECT

[Alex Deucher]

On Tue, Feb 18, 2014 at 8:48 AM, Maarten Lankhorst
<maarten.lankhorst at canonical.com> wrote:
> This fixes a crash with Xorg -configure.
>
> Bug:
> https://bugs.launchpad.net/ubuntu/+source/xorg/+bug/1278046
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>

Does Xorg -configure even do anything useful anymore?  Not crashing is good.

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
> diff --git a/src/radeon_kms.c b/src/radeon_kms.c
> index 21a420f..4a6c38e 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;
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel