[Mesa-dev] [PATCH] i965/blorp: Correct type of src_format in call to intel_miptree_texture_aux_usage

[Scott D Phillips]

Jason Ekstrand <jason at jlekstrand.net> writes:

> On Fri, Aug 11, 2017 at 10:36 AM, Scott D Phillips <
> scott.d.phillips at intel.com> wrote:
>
>> Jason Ekstrand <jason at jlekstrand.net> writes:
>>
>> > oof...  Have you run this through Jenkins?  It should be ok, but
>> > it will be a functional change.  It's a good change, but it is a
>> > change.
>>
>> I ran the patch through jenkins, where the only problem it
>> reported was a gpu hang on skl gt2 in:
>>
>> ES2-CTS.functional.state_query.integers.stencil_back_
>> fail_separate_both_getfloat
>>
>> Although the test succeeded and I didn't see a hang in several
>> thousand runs on my own skl gt2. Maybe the hang was somebody
>> else's fault?
>>
>
> Yeah, I doubt this caused the hang.  Wouldn't be a bad idea to run it again
> just to be sure.

OK, re-ran and got a clean test result.

>> > Also, this should probably get CCd to stable.
>>
>> I was under the impression that a Fixes tag somehow magically got
>> it to the right stable branches. If that's not the case then it
>> looks like it should be:
>>
>> Cc: "17.2" <mesa-stable at lists.freedesktop.org>
>>
>
> Yup, that's right.
>
> Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
>
>
>> > --Jason
>> >
>> > On Wed, Aug 9, 2017 at 3:52 PM, Scott D Phillips <
>> scott.d.phillips at intel.com
>> >> wrote:
>> >
>> >> intel_miptree_texture_aux_usage() takes an isl_format, but we are
>> >> passing a mesa_format. clang warns:
>> >>
>> >>  brw_blorp.c:305:52: warning: implicit conversion from enumeration
>> >>     type 'mesa_format' to different enumeration type
>> >>     'enum isl_format' [-Wenum-conversion]
>> >>        intel_miptree_texture_aux_usage(brw, src_mt, src_format);
>> >>        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~              ^~~~~~~~~~
>> >>
>> >> Fixes: fc1639e46d ("i965/blorp: Use texture/render_aux_usage for blits")
>> >> ---
>> >>  src/mesa/drivers/dri/i965/brw_blorp.c | 3 ++-
>> >>  1 file changed, 2 insertions(+), 1 deletion(-)
>> >>
>> >> diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c
>> >> b/src/mesa/drivers/dri/i965/brw_blorp.c
>> >> index 446f507619..d8e48064e3 100644
>> >> --- a/src/mesa/drivers/dri/i965/brw_blorp.c
>> >> +++ b/src/mesa/drivers/dri/i965/brw_blorp.c
>> >> @@ -301,8 +301,9 @@ brw_blorp_blit_miptrees(struct brw_context *brw,
>> >>        src_format = dst_format = MESA_FORMAT_R_FLOAT32;
>> >>     }
>> >>
>> >> +   enum isl_format src_isl_format = brw_isl_format_for_mesa_
>> >> format(src_format);
>> >>     enum isl_aux_usage src_aux_usage =
>> >> -      intel_miptree_texture_aux_usage(brw, src_mt, src_format);
>> >> +      intel_miptree_texture_aux_usage(brw, src_mt, src_isl_format);
>> >>     /* We do format workarounds for some depth formats so we can't
>> reliably
>> >>      * sample with HiZ.  One of these days, we should fix that.
>> >>      */
>> >> --
>> >> 2.13.3
>> >>
>> >> _______________________________________________
>> >> mesa-dev mailing list
>> >> mesa-dev at lists.freedesktop.org
>> >> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>> >>
>>