Please apply!
Thanks,
Kristof
From 30a38150ff78da4070aba21e538fb1071d764f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?RALOVICH,=20Krist=C3=B3f?= <tad...@freemail.hu>
Date: Sun, 31 Jul 2011 22:39:19 +0200
Subject: [PATCH] egl/dri2: avoid crashes without drivers
---
src/egl/drivers/dri2/platform_drm.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c
index 579baf9..1f360e5 100644
--- a/src/egl/drivers/dri2/platform_drm.c
+++ b/src/egl/drivers/dri2/platform_drm.c
@@ -101,6 +101,11 @@ dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp)
disp->DriverData = (void *) dri2_dpy;
gbm = (struct gbm_device *) disp->PlatformDisplay;
+ if (!gbm)
+ {
+ free(dri2_dpy);
+ return EGL_FALSE;
+ }
if (strcmp(gbm_device_get_backend_name(gbm), "drm") != 0) {
free(dri2_dpy);
return EGL_FALSE;
--
1.7.4.1
From 9bb537ed0bafe8d8c5a89fa3751d473bbe83c779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?RALOVICH,=20Krist=C3=B3f?= <tad...@freemail.hu>
Date: Sun, 31 Jul 2011 23:48:35 +0200
Subject: [PATCH 1/2] gbm: link gbm_gallium_drm.so against m
to avoid the following runtime error hit playing with EGL:
failed to load module: /xorg/lib64/gbm/gbm_gallium_drm.so: undefined symbol: powf
---
src/gbm/backends/Makefile.template | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/gbm/backends/Makefile.template b/src/gbm/backends/Makefile.template
index 851e5c5..18b5466 100644
--- a/src/gbm/backends/Makefile.template
+++ b/src/gbm/backends/Makefile.template
@@ -34,7 +34,7 @@ $(GBM_BACKEND).so: $(GBM_OBJECTS) Makefile $(TOP)/src/gbm/backends/Makefile.temp
@$(MKLIB) -o $(GBM_BACKEND).so -noprefix \
-linker '$(CC)' -ldflags '-L$(TOP)/$(LIB_DIR) $(LDFLAGS)' \
$(MKLIB_OPTIONS) \
- $(GBM_OBJECTS) $(GBM_LIBS) -l$(GBM_LIB)
+ $(GBM_OBJECTS) $(GBM_LIBS) -l$(GBM_LIB) -lm
lib$(GBM_BACKEND).a: $(GBM_OBJECTS) Makefile $(TOP)/src/gbm/backends/Makefile.template
@$(MKLIB) -o $(GBM_BACKEND) -static $(GBM_OBJECTS)
--
1.7.4.1
From dbe49d26f6552c20b70154cae90a46c4a6c0ffc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?RALOVICH,=20Krist=C3=B3f?= <tad...@freemail.hu>
Date: Sun, 31 Jul 2011 23:49:43 +0200
Subject: [PATCH 2/2] gbm/dri: avoid crash in dri_screen_create
---
src/gbm/backends/dri/gbm_dri.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
index 6bb7848..ce64e2b 100644
--- a/src/gbm/backends/dri/gbm_dri.c
+++ b/src/gbm/backends/dri/gbm_dri.c
@@ -194,6 +194,8 @@ dri_screen_create(struct gbm_dri_device *dri)
dri->screen = dri->dri2->createNewScreen(0, dri->base.base.fd,
dri->extensions,
&dri->driver_configs, dri);
+ if (!dri->screen)
+ return -1;
extensions = dri->core->getExtensions(dri->screen);
if (dri_bind_extensions(dri, dri_core_extensions, extensions) < 0) {
--
1.7.4.1
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
