xf86-video-ati: Branch 'master'
Michel Dänzer
daenzer at kemper.freedesktop.org
Mon Mar 18 07:17:35 PDT 2013
src/radeon_glamor.c | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 462d8d3b86038438ab854072e546cc7a9efacdd7
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Tue Mar 12 18:59:19 2013 +0100
glamor: Bail if the glamoregl module wasn't loaded early
Trying to initialize glamor in that case crashes.
Reviewed-by: Jerome Glisse <jglisse at redhat.com>
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);
More information about the xorg-commit
mailing list