<div dir="ltr">Pushed. </div><div class="gmail_extra"> <div class="gmail_quote">On Mon, Aug 14, 2017 at 10:37 AM, Scott D Phillips <<a href="mailto:scott.d.phillips@intel.com" target="_blank">scott.d.phillips@intel.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> writes: > On Fri, Aug 11, 2017 at 10:36 AM, Scott D Phillips < > <a href="mailto:scott.d.phillips@intel.com">scott.d.phillips@intel.com</a>> wrote: > >> Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> 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. <div class="HOEnZb"><div class="h5"> >> > 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" <<a href="mailto:mesa-stable@lists.freedesktop.org">mesa-stable@lists.freedesktop.org</a>> >> > > Yup, that's right. > > Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> > > >> > --Jason >> > >> > On Wed, Aug 9, 2017 at 3:52 PM, Scott D Phillips < >> <a href="mailto:scott.d.phillips@intel.com">scott.d.phillips@intel.com</a> >> >> 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 >> >> <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> >> >> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> >> >> >> </div></div></blockquote></div> </div>