<div dir="ltr"><div><div>Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>> </div>Note that this is not meant for master, because master doesn't need this fix anymore. </div>Marek </div><div class="gmail_extra"> <div class="gmail_quote">On Sat, May 13, 2017 at 12:07 AM, Mauro Rossi <<a href="mailto:issor.oruam@gmail.com" target="_blank">issor.oruam@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">'if (regs->counters)' expression at line 623 is always true, spotted because of an error when building android-x86. 'if (regs->counters[idx])' is used instead. Fixes the following building error in Android: external/mesa/src/gallium/drivers/radeonsi/si_perfcounter.c:617:14: error: address of array 'regs->counters' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] if (regs->counters) ~~ ~~~~~~^~~~~~~~ Fixes: ad22006 "radeonsi: implement AMD_performance_monitor for CIK+" --- src/gallium/drivers/radeonsi/si_perfcounter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_perfcounter.c b/src/gallium/drivers/radeonsi/si_perfcounter.c index 41dd52edb1..85b6e5c55a 100644 --- a/src/gallium/drivers/radeonsi/si_perfcounter.c +++ b/src/gallium/drivers/radeonsi/si_perfcounter.c @@ -620,7 +620,7 @@ static void si_pc_emit_read(struct r600_common_context *ctx, reg_delta = -reg_delta; for (idx = 0; idx < count; ++idx) { - if (regs->counters) + if (regs->counters[idx]) reg = regs->counters[idx]; radeon_emit(cs, PKT3(PKT3_COPY_DATA, 4, 0)); -- 2.11.0 _______________________________________________ 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> </blockquote></div> </div>