Title: [276196] trunk/Tools/buildstream
- Revision
- 276196
- Author
- [email protected]
- Date
- 2021-04-17 02:03:51 -0700 (Sat, 17 Apr 2021)
Log Message
REGRESSION(r275755): [GStreamer] Crashes on surfaceless i915 platforms
https://bugs.webkit.org/show_bug.cgi?id=224416
Patch by Philippe Normand <[email protected]> on 2021-04-17
Reviewed by Adrian Perez de Castro.
Vendor potential fix for https://gitlab.freedesktop.org/mesa/mesa/-/issues/778.
* elements/sdk/mesa.bst:
* patches/mesa/0001-i915-Prevent-invalid-framebuffer-usage.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/buildstream/ChangeLog (276195 => 276196)
--- trunk/Tools/buildstream/ChangeLog 2021-04-17 05:03:59 UTC (rev 276195)
+++ trunk/Tools/buildstream/ChangeLog 2021-04-17 09:03:51 UTC (rev 276196)
@@ -1,3 +1,15 @@
+2021-04-17 Philippe Normand <[email protected]>
+
+ REGRESSION(r275755): [GStreamer] Crashes on surfaceless i915 platforms
+ https://bugs.webkit.org/show_bug.cgi?id=224416
+
+ Reviewed by Adrian Perez de Castro.
+
+ Vendor potential fix for https://gitlab.freedesktop.org/mesa/mesa/-/issues/778.
+
+ * elements/sdk/mesa.bst:
+ * patches/mesa/0001-i915-Prevent-invalid-framebuffer-usage.patch: Added.
+
2021-04-12 Philippe Normand <[email protected]>
Unreviewed, update libsoup 2.99.3 ref
Modified: trunk/Tools/buildstream/elements/sdk/mesa.bst (276195 => 276196)
--- trunk/Tools/buildstream/elements/sdk/mesa.bst 2021-04-17 05:03:59 UTC (rev 276195)
+++ trunk/Tools/buildstream/elements/sdk/mesa.bst 2021-04-17 09:03:51 UTC (rev 276196)
@@ -106,6 +106,10 @@
- kind: git_tag
url: gitlab_freedesktop_org:mesa/mesa.git
track: '20.3'
- ref: mesa-20.3.2-1-g6d2e76d2425901dec7bb21da62b5f0f2b81f1e8a
+ ref: mesa-20.3.5-1-g42a4d76fccfee52ec5ca24db7a8df661a0e8e66b
+ exclude:
+ - '*.0'
- kind: patch
path: patches/mesa/mesa_libdrm_deps.patch
+- kind: patch
+ path: patches/mesa/0001-i915-Prevent-invalid-framebuffer-usage.patch
Added: trunk/Tools/buildstream/patches/mesa/0001-i915-Prevent-invalid-framebuffer-usage.patch (0 => 276196)
--- trunk/Tools/buildstream/patches/mesa/0001-i915-Prevent-invalid-framebuffer-usage.patch (rev 0)
+++ trunk/Tools/buildstream/patches/mesa/0001-i915-Prevent-invalid-framebuffer-usage.patch 2021-04-17 09:03:51 UTC (rev 276196)
@@ -0,0 +1,40 @@
+From 90aee1d2d233b1df051cf41f77d5a092e335cb28 Mon Sep 17 00:00:00 2001
+From: Philippe Normand <[email protected]>
+Date: Sun, 11 Apr 2021 13:27:56 +0100
+Subject: [PATCH] i915: Prevent invalid framebuffer usage
+
+When a surfaceless context is in use, driDrawablePriv might be NULL, so needs to
+be checked before calling dri2InvalidateDrawable. Same for read calls.
+
+Fixes #778
+---
+ src/mesa/drivers/dri/i915/intel_buffers.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/i915/intel_buffers.c b/src/mesa/drivers/dri/i915/intel_buffers.c
+index 83d59edb6fa..a4340fff6bb 100644
+--- a/src/mesa/drivers/dri/i915/intel_buffers.c
++++ b/src/mesa/drivers/dri/i915/intel_buffers.c
+@@ -62,7 +62,8 @@ intelDrawBuffer(struct gl_context * ctx)
+ * time, invalidate our DRI drawable so we'll ask for new buffers
+ * (including the fake front) before we start rendering again.
+ */
+- dri2InvalidateDrawable(intel->driContext->driDrawablePriv);
++ if (intel->driContext->driDrawablePriv)
++ dri2InvalidateDrawable(intel->driContext->driDrawablePriv);
+ }
+
+ intel_draw_buffer(ctx);
+@@ -79,7 +80,8 @@ intelReadBuffer(struct gl_context * ctx, GLenum mode)
+ * time, invalidate our DRI drawable so we'll ask for new buffers
+ * (including the fake front) before we start reading again.
+ */
+- dri2InvalidateDrawable(intel->driContext->driReadablePriv);
++ if (intel->driContext->driReadablePriv)
++ dri2InvalidateDrawable(intel->driContext->driReadablePriv);
+ }
+ }
+
+--
+2.31.1
+
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
