[Mesa-dev] [PATCH] r600g: don't emit surface_sync after FLUSH_AND_INV_EVENT

[Aaron Watry]

I know it's been pushed already, but this also fixes some lockups that
I was seeing on Barts (HD6850) when running piglit's OpenCL tests.

Thanks for fixing this.

--Aaron

On Fri, May 3, 2013 at 9:47 AM, Marek Olšák <maraeo at gmail.com> wrote:
> Reviewed-by: Marek Olšák <maraeo at gmail.com>
>
> Marek
>
> On Fri, May 3, 2013 at 4:01 PM,  <alexdeucher at gmail.com> wrote:
>> From: Alex Deucher <alexander.deucher at amd.com>
>>
>> It shouldn't be needed since the FLUSH_AND_INV_EVENT has already
>> made sure the destination caches are flushed.  Additionally,
>> we didn't previously emit the surface_sync until this commit:
>> http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5e4c07e7964a3258ed02b530bcdc24c0650204b
>> Emitting them together causes hangs in compute on cayman/TN
>> and hangs in Heaven on evergreen.
>>
>> Note: this patch is a candidate for the 9.1 branch, but requires:
>> http://cgit.freedesktop.org/mesa/mesa/commit/?id=156bcca62c9f4e79e78929f72bc085757f36a65a
>> as well.
>>
>> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
>> ---
>>  src/gallium/drivers/r600/r600_hw_context.c |   26 --------------------------
>>  1 files changed, 0 insertions(+), 26 deletions(-)
>>
>> diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
>> index 6d8b2cf..944b666 100644
>> --- a/src/gallium/drivers/r600/r600_hw_context.c
>> +++ b/src/gallium/drivers/r600/r600_hw_context.c
>> @@ -226,32 +226,6 @@ void r600_flush_emit(struct r600_context *rctx)
>>         if (rctx->flags & R600_CONTEXT_FLUSH_AND_INV) {
>>                 cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
>>                 cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_CACHE_FLUSH_AND_INV_EVENT) | EVENT_INDEX(0);
>> -               if (rctx->chip_class >= EVERGREEN) {
>> -                       /* We were previously setting the CB and DB bits on
>> -                        * cp_coher_cntl, but this is unnecessary since
>> -                        * we are emitting the
>> -                        * EVENT_TYPE_CACHE_FLUSH_AND_INV_EVENT packet.
>> -                        * Setting the CB bits was causing lockups when using
>> -                        * compute on cayman.
>> -                        *
>> -                        * XXX: Do even need to emit a surface sync packet here?
>> -                        * Prior to e5e4c07e7964a3258ed02b530bcdc24c0650204b
>> -                        * surface sync was not being emitted with the
>> -                        * R600_CONTEXT_FLUSH_AND_INV flag.
>> -                        */
>> -                       cp_coher_cntl = S_0085F0_TC_ACTION_ENA(1) |
>> -                                       S_0085F0_DB_ACTION_ENA(1) |
>> -                                       S_0085F0_SH_ACTION_ENA(1) |
>> -                                       S_0085F0_SMX_ACTION_ENA(1) |
>> -                                       S_0085F0_FULL_CACHE_ENA(1);
>> -               } else {
>> -                       cp_coher_cntl = S_0085F0_SMX_ACTION_ENA(1) |
>> -                                       S_0085F0_SH_ACTION_ENA(1) |
>> -                                       S_0085F0_VC_ACTION_ENA(1) |
>> -                                       S_0085F0_TC_ACTION_ENA(1) |
>> -                                       S_0085F0_FULL_CACHE_ENA(1);
>> -               }
>> -               emit_flush = 1;
>>         }
>>
>>         if (rctx->flags & R600_CONTEXT_INVAL_READ_CACHES) {
>> --
>> 1.7.7.5
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev