[Mesa-dev] [PATCH] i965/miptree: Move isl_surf_get_(hiz|mcs)_surf out of the assert

[Mike Lothian]

Do intel run mesa through any of their test boxes like they do with kernel
patches?

On Wed, 21 Jun 2017 at 19:23 Jason Ekstrand <jason at jlekstrand.net> wrote:

> On Wed, Jun 21, 2017 at 11:20 AM, Pohjolainen, Topi <
> topi.pohjolainen at gmail.com> wrote:
>
>> On Wed, Jun 21, 2017 at 11:16:39AM -0700, Jason Ekstrand wrote:
>> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101538
>> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101539
>>
>> I guess also:
>>
>> https://bugs.freedesktop.org/show_bug.cgi?id=101535
>>
>> Thanks for the quick fix!!
>>
>
> No problem.  I've landed it now so peoples desktops can start working
> again.
>
>
>> Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
>>
>> > Cc: Topi Pohjolainen <topi.pohjolainen at intel.com>
>> > ---
>> >  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 10 ++++++----
>> >  1 file changed, 6 insertions(+), 4 deletions(-)
>> >
>> > diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
>> b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
>> > index abc7f98..3b7262f 100644
>> > --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
>> > +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
>> > @@ -1672,8 +1672,9 @@ intel_miptree_alloc_mcs(struct brw_context *brw,
>> >      * calculate equivalent MCS surface against it.
>> >      */
>> >     intel_miptree_get_isl_surf(brw, mt, &temp_main_surf);
>> > -   assert(isl_surf_get_mcs_surf(&brw->isl_dev, &temp_main_surf,
>> > -                                &temp_mcs_surf));
>> > +   MAYBE_UNUSED bool ok =
>> > +      isl_surf_get_mcs_surf(&brw->isl_dev, &temp_main_surf,
>> &temp_mcs_surf);
>> > +   assert(ok);
>> >
>> >     /* Buffer needs to be initialised requiring the buffer to be
>> immediately
>> >      * mapped to cpu space for writing. Therefore do not use the gpu
>> access
>> > @@ -1832,8 +1833,9 @@ intel_miptree_alloc_hiz(struct brw_context *brw,
>> >     struct isl_surf temp_hiz_surf;
>> >
>> >     intel_miptree_get_isl_surf(brw, mt, &temp_main_surf);
>> > -   assert(isl_surf_get_hiz_surf(&brw->isl_dev, &temp_main_surf,
>> > -                                &temp_hiz_surf));
>> > +   MAYBE_UNUSED bool ok =
>> > +      isl_surf_get_hiz_surf(&brw->isl_dev, &temp_main_surf,
>> &temp_hiz_surf);
>> > +   assert(ok);
>> >
>> >     const uint32_t alloc_flags = BO_ALLOC_FOR_RENDER;
>> >     mt->hiz_buf = intel_alloc_aux_buffer(brw, "hiz-miptree",
>> > --
>> > 2.5.0.400.gff86faf
>> >
>> > _______________________________________________
>> > mesa-dev mailing list
>> > mesa-dev at lists.freedesktop.org
>> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170621/919272aa/attachment-0001.html>