[Mesa-stable] [Mesa-dev] [PATCH 2/4] i965/gen10: Implement WaForceRCPFEHangWorkaround

[Anuj Phogat]

On Mon, Oct 30, 2017 at 2:02 PM, Nanley Chery <nanleychery at gmail.com> wrote:
> On Mon, Oct 02, 2017 at 04:07:58PM -0700, Anuj Phogat wrote:
>> Cc: mesa-stable at lists.freedesktop.org
>> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
>> ---
>>  src/mesa/drivers/dri/i965/brw_pipe_control.c | 19 +++++++++++++++++++
>>  1 file changed, 19 insertions(+)
>>
>> diff --git a/src/mesa/drivers/dri/i965/brw_pipe_control.c b/src/mesa/drivers/dri/i965/brw_pipe_control.c
>> index 6326957a7a..3192d31758 100644
>> --- a/src/mesa/drivers/dri/i965/brw_pipe_control.c
>> +++ b/src/mesa/drivers/dri/i965/brw_pipe_control.c
>> @@ -89,6 +89,22 @@ gen7_cs_stall_every_four_pipe_controls(struct brw_context *brw, uint32_t flags)
>>     return 0;
>>  }
>>
>> +/* #1130 from gen10 workarounds page in h/w specs:
>> + * "If a PIPE_CONTROL performs Render Target Cache Flush, function sets stall
>       ^
> Was this meant to be a quote? I don't see this text on this page.
>
>> + * at Pixel Scoreboard. Otherwise, the function assumes that PIPE_CONTROL
>> + * performs Post Sync Operation and WA sets Depth Stall Enable.
>> + *
>
> Why assume instead of checking bits 14, 15 and 23 of `flags`?
>
Good catch. Let me send a V2 with added check and above comment fixed.
We don't need to check for bit 23. Workaround talks about 'Post Sync
Operation' but says nothing about 'LRI Post Sync Operation'. We're
not using bit 23 in Mesa anyways and the workaround is applicable only
until CNL C0 stepping.


> -Nanley
>
>> + * Applicable to CNL B0 and C0 steppings only.
>> + */
>> +static void
>> +gen10_add_rcpfe_workaround_bits(uint32_t *flags)
>> +{
>> +   if ((*flags & PIPE_CONTROL_RENDER_TARGET_FLUSH) != 0)
>> +      *flags = *flags | PIPE_CONTROL_STALL_AT_SCOREBOARD;
>> +   else
>> +      *flags = *flags | PIPE_CONTROL_DEPTH_STALL;
>> +}
>> +
>>  static void
>>  brw_emit_pipe_control(struct brw_context *brw, uint32_t flags,
>>                        struct brw_bo *bo, uint32_t offset, uint64_t imm)
>> @@ -109,6 +125,9 @@ brw_emit_pipe_control(struct brw_context *brw, uint32_t flags,
>>           brw_emit_pipe_control_flush(brw, 0);
>>        }
>>
>> +      if (devinfo->gen == 10)
>> +         gen10_add_rcpfe_workaround_bits(&flags);
>> +
>>        BEGIN_BATCH(6);
>>        OUT_BATCH(_3DSTATE_PIPE_CONTROL | (6 - 2));
>>        OUT_BATCH(flags);
>> --
>> 2.13.5
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev