[Mesa-stable] [Mesa-dev] [PATCH] i965/miptree: Fail gracefully when make_surface returns NULL

[Juan A. Suarez Romero]

On Thu, 2018-01-04 at 11:38 -0800, Ian Romanick wrote:
> On 01/03/2018 01:27 PM, Jason Ekstrand wrote:
> > This patch looks good in isolation and you can have my rb.  However,
> > this all a bit concerning and it makes me wonder if we're papering over
> > the real bug.
> 
> It may be a bit of both.  There's also some debate in the bugzilla about
> whether or not this fixes the original bug or if there are actually two
> problems or ...  I'm going to wait a bit to push this, and I'm going to
> try to investigate the other crash that has been observed.
> 

What happened at the end with this patch? Still waiting to push, or has it been
superseded?


Asking because it was nominated for 17.3, but didn't land in master.

Thanks in advance.


	J.A.

> > On January 3, 2018 12:41:56 "Ian Romanick" <idr at freedesktop.org> wrote:
> > 
> > > From: Ian Romanick <ian.d.romanick at intel.com>
> > > 
> > > Every other caller of make_surface does something sensible when NULL is
> > > returned.
> > > 
> > > Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104214
> > > Tested-by: Cyril <cyril.duez at gmail.com>
> > > Cc: "17.3" <mesa-stable at lists.freedesktop.org>
> > > ---
> > >  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 3 +++
> > >  1 file changed, 3 insertions(+)
> > > 
> > > diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> > > b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> > > index ead0c35..0079a08 100644
> > > --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> > > +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> > > @@ -719,6 +719,9 @@ miptree_create(struct brw_context *brw,
> > >           ISL_SURF_USAGE_DEPTH_BIT | ISL_SURF_USAGE_TEXTURE_BIT,
> > >           BO_ALLOC_BUSY, 0, NULL);
> > > 
> > > +      if (mt == NULL)
> > > +         return NULL;
> > > +
> > >        if (needs_separate_stencil(brw, mt, format) &&
> > >            !make_separate_stencil_surface(brw, mt)) {
> > >           intel_miptree_release(&mt);
> > > -- 
> > > 2.9.5
> > > 
> > > _______________________________________________
> > > mesa-dev mailing list
> > > mesa-dev at lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> 
> _______________________________________________
> mesa-stable mailing list
> mesa-stable at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-stable