summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdel Gadllah <adel.gadllah@gmail.com>2014-07-03 22:13:53 +0200
committerKenneth Graunke <kenneth@whitecape.org>2014-07-17 14:42:35 -0700
commitb656e3c603da46fe0acd9905dc039c93d76f0b06 (patch)
treec0971adc95d8708d56a157d921930d289eaebda3
parent4ceb612a10d7776631b196ae13be9c5588154468 (diff)
i915: Fix up intelInitScreen2 for DRI3
Commit 442442026eb updated both i915 and i965 for DRI3 support, but one check in intelInitScreen2 was missed for i915 causing crashes when trying to use i915 with DRI3. So fix that up. Reported-by: Igor Gnatenko <i.gnatenko.brain@gmail.com> References: https://bugzilla.redhat.com/show_bug.cgi?id=1115323 References: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=754297 Tested-by: FrantiĊĦek Zatloukal <Zatloukal.Frantisek@gmail.com> Tested-by: Dirk Griesbach <spamthis@freenet.de> Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Cc: "10.2" <mesa-stable@lists.freedesktop.org>
-rw-r--r--src/mesa/drivers/dri/i915/intel_screen.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 9b4e490df07..4c9726c299f 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -1152,7 +1152,8 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
{
struct intel_screen *intelScreen;
- if (psp->dri2.loader->base.version <= 2 ||
+ if (psp->image.loader) {
+ } else if (psp->dri2.loader->base.version <= 2 ||
psp->dri2.loader->getBuffersWithFormat == NULL) {
fprintf(stderr,
"\nERROR! DRI2 loader with getBuffersWithFormat() "