Re: [Mesa-dev] [PATCH] st/mesa: Handle st_framebuffer_create returning NULL

[Michel Dänzer]

On 13/07/17 11:00 PM, Brian Paul wrote:
> 
> Reviewed-by: Brian Paul 
Thanks for all the reviews, and to Brian for pushing the fix while I was
on the dark side of the globe.

FWIW, I later discovered that the crash also affected some EGL piglit tests.


-- 
Earthling Michel Dänzer   |   http://www.amd.com
Libre software enthusiast | Mesa and X developer
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] st/mesa: Handle st_framebuffer_create returning NULL

[Charmaine Lee]

Reviewed-by: Charmaine Lee 

From: Michel Dänzer 
Sent: Thursday, July 13, 2017 12:21 AM
To: mesa-dev@lists.freedesktop.org
Cc: Charmaine Lee; Brian Paul
Subject: [PATCH] st/mesa: Handle st_framebuffer_create returning NULL

From: Michel Dänzer 

st_framebuffer_create returns NULL if stfbi == NULL or
st_framebuffer_add_renderbuffer returns false for the colour buffer.

Fixes Xorg crashing on startup using glamor on radeonsi.

Fixes: 147d7fb772a7 ("st/mesa: add a winsys buffers list in st_context")
Bugzilla: 
https://urldefense.proofpoint.com/v2/url?u=https-3A__bugs.freedesktop.org_show-5Fbug.cgi-3Fid-3D101775=DwIDaQ=uilaK90D4TOVoH58JNXRgQ=Ang1qmMo4GwCmRUnLE-f31kqPa6AOnoS-OAMUzQyM0M=UEU3ibcz-_bgA7gbDqxCJ-TuosvjQ-3MVZhk0YlAaHM=m4MMnUdTtDoBav5jZlfidkkA0ORGokAl9-djnste8Hw=
Signed-off-by: Michel Dänzer 
---
 src/mesa/state_tracker/st_manager.c | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/state_tracker/st_manager.c 
b/src/mesa/state_tracker/st_manager.c
index de16a3a2cf..348b456c4d 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -802,10 +802,12 @@ st_framebuffer_reuse_or_create(struct st_context *st,
if (stfb == NULL) {
   cur = st_framebuffer_create(st, stfbi);

-  /* add to the context's winsys buffers list */
-  LIST_ADD(>head, >winsys_buffers);
+  if (cur) {
+ /* add to the context's winsys buffers list */
+ LIST_ADD(>head, >winsys_buffers);

-  st_framebuffer_reference(, cur);
+ st_framebuffer_reference(, cur);
+  }
}

return stfb;
--
2.13.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] st/mesa: Handle st_framebuffer_create returning NULL

[Brian Paul]

Reviewed-by: Brian Paul 


On 07/13/2017 01:21 AM, Michel Dänzer wrote:

From: Michel Dänzer 

st_framebuffer_create returns NULL if stfbi == NULL or
st_framebuffer_add_renderbuffer returns false for the colour buffer.

Fixes Xorg crashing on startup using glamor on radeonsi.

Fixes: 147d7fb772a7 ("st/mesa: add a winsys buffers list in st_context")
Bugzilla: 
https://urldefense.proofpoint.com/v2/url?u=https-3A__bugs.freedesktop.org_show-5Fbug.cgi-3Fid-3D101775=DwIDaQ=uilaK90D4TOVoH58JNXRgQ=Ie7_encNUsqxbSRbqbNgofw0ITcfE8JKfaUjIQhncGA=JNCyW5cReAi0ISzxpO5MRewn50f_1y6L63_-3dfGTGA=un_LLa7Y14lB-Bwufyy6XKjSV64NkCg51HzF1w23M9w=
Signed-off-by: Michel Dänzer 
---
  src/mesa/state_tracker/st_manager.c | 8 +---
  1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/state_tracker/st_manager.c 
b/src/mesa/state_tracker/st_manager.c
index de16a3a2cf..348b456c4d 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -802,10 +802,12 @@ st_framebuffer_reuse_or_create(struct st_context *st,
 if (stfb == NULL) {
cur = st_framebuffer_create(st, stfbi);

-  /* add to the context's winsys buffers list */
-  LIST_ADD(>head, >winsys_buffers);
+  if (cur) {
+ /* add to the context's winsys buffers list */
+ LIST_ADD(>head, >winsys_buffers);

-  st_framebuffer_reference(, cur);
+ st_framebuffer_reference(, cur);
+  }
 }

 return stfb;



___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] st/mesa: Handle st_framebuffer_create returning NULL

[Nicolai Hähnle]

On 13.07.2017 09:21, Michel Dänzer wrote:

From: Michel Dänzer 

st_framebuffer_create returns NULL if stfbi == NULL or
st_framebuffer_add_renderbuffer returns false for the colour buffer.

Fixes Xorg crashing on startup using glamor on radeonsi.

Fixes: 147d7fb772a7 ("st/mesa: add a winsys buffers list in st_context")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101775
Signed-off-by: Michel Dänzer 


Reviewed-by: Nicolai Hähnle 



---
  src/mesa/state_tracker/st_manager.c | 8 +---
  1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/state_tracker/st_manager.c 
b/src/mesa/state_tracker/st_manager.c
index de16a3a2cf..348b456c4d 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -802,10 +802,12 @@ st_framebuffer_reuse_or_create(struct st_context *st,
 if (stfb == NULL) {
cur = st_framebuffer_create(st, stfbi);
  
-  /* add to the context's winsys buffers list */

-  LIST_ADD(>head, >winsys_buffers);
+  if (cur) {
+ /* add to the context's winsys buffers list */
+ LIST_ADD(>head, >winsys_buffers);
  
-  st_framebuffer_reference(, cur);

+ st_framebuffer_reference(, cur);
+  }
 }
  
 return stfb;





--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] st/mesa: Handle st_framebuffer_create returning NULL

[Michel Dänzer]

From: Michel Dänzer 

st_framebuffer_create returns NULL if stfbi == NULL or
st_framebuffer_add_renderbuffer returns false for the colour buffer.

Fixes Xorg crashing on startup using glamor on radeonsi.

Fixes: 147d7fb772a7 ("st/mesa: add a winsys buffers list in st_context")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101775
Signed-off-by: Michel Dänzer 
---
 src/mesa/state_tracker/st_manager.c | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/state_tracker/st_manager.c 
b/src/mesa/state_tracker/st_manager.c
index de16a3a2cf..348b456c4d 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -802,10 +802,12 @@ st_framebuffer_reuse_or_create(struct st_context *st,
if (stfb == NULL) {
   cur = st_framebuffer_create(st, stfbi);
 
-  /* add to the context's winsys buffers list */
-  LIST_ADD(>head, >winsys_buffers);
+  if (cur) {
+ /* add to the context's winsys buffers list */
+ LIST_ADD(>head, >winsys_buffers);
 
-  st_framebuffer_reference(, cur);
+ st_framebuffer_reference(, cur);
+  }
}
 
return stfb;
-- 
2.13.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev