[PATCH 1/2] glamor: Bail if the glamoregl module wasn't loaded early

[Jerome Glisse]

On Tue, Mar 12, 2013 at 2:09 PM, Michel Dänzer <michel at daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> Trying to initialize glamor in that case crashes.
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

For the serie
Reviewed-by: Jerome Glisse <jglisse at redhat.com>

> ---
>  src/radeon_glamor.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
> index 5a7561f..ef7d95c 100644
> --- a/src/radeon_glamor.c
> +++ b/src/radeon_glamor.c
> @@ -93,6 +93,13 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
>         if (strcasecmp(s, "glamor") != 0)
>                 return FALSE;
>
> +       if (!xf86LoaderCheckSymbol("glamor_egl_init")) {
> +               xf86DrvMsg(scrn->scrnIndex, s ? X_ERROR : X_WARNING,
> +                          "glamor requires Load \"glamoregl\" in "
> +                          "Section \"Module\", disabling.\n");
> +               return FALSE;
> +       }
> +
>         /* Load glamor module */
>         if ((glamor_module = xf86LoadSubModule(scrn, GLAMOR_EGL_MODULE_NAME))) {
>                 version = xf86GetModuleVersion(glamor_module);
> --
> 1.8.2.rc3
>
> _______________________________________________
> xorg-driver-ati mailing list
> xorg-driver-ati at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-driver-ati