|
On Thursday, January 4, 2018 4:41:35 PM PST Rodrigo Vivi wrote:
On Thu, Jan 04, 2018 at 11:39:23PM +0000, Kenneth Graunke wrote:
On Thursday, January 4, 2018 1:23:06 PM PST Chris Wilson wrote:
Quoting Kenneth Graunke (2018-01-04 19:38:05)
Geminilake requires the 3D driver to select whether barriers are
intended for compute shaders, or tessellation control shaders, by
whacking a "Barrier Mode" bit in SLICE_COMMON_ECO_CHICKEN1 when
switching pipelines. Failure to do this properly can result in GPU
hangs.
Unfortunately, this means it needs to switch mid-batch, so only
userspace can properly set it. To facilitate this, the kernel needs
to whitelist the register.
Signed-off-by: Kenneth Graunke <kenneth@xxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
---
drivers/gpu/drm/i915/i915_reg.h | 2 ++
drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++++
2 files changed, 7 insertions(+)
Hello,
We unfortunately need to whitelist an extra register for GPU hang fix
on Geminilake. Here's the corresponding Mesa patch:
Thankfully it appears to be context saved. Has a w/a name been assigned
for this?
-Chris
There doesn't appear to be one. The workaround page lists it, but there
is no name. The register description has a note saying that you need to
set this, but doesn't call it out as a workaround.
It mentions only BXT:ALL, but not mention to GLK.
Should we add to both then?
Well, that's irritating.
Indeed. As always :)
On the workarounds page, it does indeed say
"BXT" with no mention of GLK. But the workaround text says to set
"SLICE_COMMON_CHICKEN_ECO1 Barrier Mode [...] (bit 7 of MMIO 0x731C)."
Looking at the register definition for SLICE_COMMON_ECO_CHICKEN1, bit 7
is "Barrier Mode" on [GLK] only, with no mention of BXT. It's marked
reserved PBC on [SKL+, not GLK, not KBL]. On KBL it's something else.
I have no ways to check this bit right now,
But your explanation makes sense so I agree with you...
I believe Mark saw hangs in tessellation control shader hangs on
Geminilake only, and never saw this issue on Broxton. So, my guess is
that the workaround really is new on Geminilake, and the BXT tag on the
workarounds page is incorrect. (Mark, does that sound right to you?)
Probably worth a mention on comment or commit msg?!
That's why I put a generic comment, rather than the name.
On Display side we started using the row name for this case, to help
easily finding this later.
ex: "Display WA #0390: skl,kbl"
The number for this apparently is:
WA #0862
Maybe we could use this one to start
/* GT WA #0862: bxt,glk */
GT? GEM?
Unnamed WA #0862?
Including #0862 seems like a good idea. I'm happy to change the comment
to whatever you'd prefer.
Leave your comment and add WA #0862...
If later we define a standardized style we come back and change this.
Thanks
Rodrigo
--Ken
|
