drm/i915: Disable caches for Global GTT.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915: Disable caches for Global GTT.
Global GTT doesn't have pat_sel[2:0] so it always point to pat_sel = 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.
MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to pat_sel = 000"
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +21 -8
@@ -1911,14 +1911,27 @@ static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv) {uint64_t pat; - pat =GEN8_PPAT (0 ,GEN8_PPAT_WB |GEN8_PPAT_LLC ) |/* for normal objects, no eLLC */ -GEN8_PPAT (1 ,GEN8_PPAT_WC |GEN8_PPAT_LLCELLC ) |/* for something pointing to ptes? */ -GEN8_PPAT (2 ,GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ) |/* for scanout with eLLC */ -GEN8_PPAT (3 ,GEN8_PPAT_UC ) |/* Uncached objects, mostly for scanout */ -GEN8_PPAT (4 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )) | -GEN8_PPAT (5 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )) | -GEN8_PPAT (6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )) | -GEN8_PPAT (7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); +if (!USES_PPGTT (dev_priv->dev)) +/* Spec: "For GGTT, there is NO pat_sel[2:0] from the entry, +* so RTL will always use the value corresponding to +* pat_sel = 000". +* So let's disable cache for GGTT to avoid screen corruptions. +* MOCS still can be used though. +*/ + pat =GEN8_PPAT (0 ,GEN8_PPAT_UC ); +else + pat =GEN8_PPAT (0 ,GEN8_PPAT_WB |GEN8_PPAT_LLC ) |/* for normal objects, no eLLC */ +GEN8_PPAT (1 ,GEN8_PPAT_WC |GEN8_PPAT_LLCELLC ) |/* for something pointing to ptes? */ +GEN8_PPAT (2 ,GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ) |/* for scanout with eLLC */ +GEN8_PPAT (3 ,GEN8_PPAT_UC ) |/* Uncached objects, mostly for scanout */ +GEN8_PPAT (4 ,GEN8_PPAT_WB | +GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )) | +GEN8_PPAT (5 ,GEN8_PPAT_WB | +GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )) | +GEN8_PPAT (6 ,GEN8_PPAT_WB | +GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )) | +GEN8_PPAT (7 ,GEN8_PPAT_WB | +GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 ));/* XXX: spec defines this as 2 distinct registers. It's unclear if a 64b * write would work. */
Signature · 6 lines
1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 22 lines · Rodrigo Vivi
Global GTT doesn't have pat_sel[2:0] so it always point to
pat_sel= 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to
pat_sel= 000"Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
Cc James Ausmus <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0@@ -1911,14 +1911,27 @@ static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv) {
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv) · line 1921
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +0
-8uint64_t pat; - pat =GEN8_PPAT (0 ,GEN8_PPAT_WB |GEN8_PPAT_LLC ) |/* for normal objects, no eLLC */ -GEN8_PPAT (1 ,GEN8_PPAT_WC |GEN8_PPAT_LLCELLC ) |/* for something pointing to ptes? */ -GEN8_PPAT (2 ,GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ) |/* for scanout with eLLC */ -GEN8_PPAT (3 ,GEN8_PPAT_UC ) |/* Uncached objects, mostly for scanout */ -GEN8_PPAT (4 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )) | -GEN8_PPAT (5 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )) | -GEN8_PPAT (6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )) | -GEN8_PPAT (7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 ));
Instead of deleting this and making a rather ugly if,
Just
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv) · line 1921
Quoted 8 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +8
-0+if (!USES_PPGTT (dev_priv)) +/* Spec: "For GGTT, there is NO pat_sel[2:0] from the entry, +* so RTL will always use the value corresponding to +* pat_sel = 000". +* So let's disable cache for GGTT to avoid screen corruptions. +* MOCS still can be used though. +*/ + pat =GEN8_PPAT (0 ,GEN8_PPAT_UC );
to override in the unlikely case of disabling ppgtt. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 37 lines · Chris Wilson
Quoted 22 lines · Rodrigo Vivi
Global GTT doesn't have pat_sel[2:0] so it always point to
pat_sel= 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to
pat_sel= 000"Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
Cc James Ausmus <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0@@ -1911,14 +1911,27 @@ static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv) {drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv) · line 1921
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +0
-8uint64_t pat; - pat =GEN8_PPAT (0 ,GEN8_PPAT_WB |GEN8_PPAT_LLC ) |/* for normal objects, no eLLC */ -GEN8_PPAT (1 ,GEN8_PPAT_WC |GEN8_PPAT_LLCELLC ) |/* for something pointing to ptes? */ -GEN8_PPAT (2 ,GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ) |/* for scanout with eLLC */ -GEN8_PPAT (3 ,GEN8_PPAT_UC ) |/* Uncached objects, mostly for scanout */ -GEN8_PPAT (4 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )) | -GEN8_PPAT (5 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )) | -GEN8_PPAT (6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )) | -GEN8_PPAT (7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 ));Instead of deleting this and making a rather ugly if,
Just
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv) · line 1921
Quoted 8 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +8
-0+if (!USES_PPGTT (dev_priv)) +/* Spec: "For GGTT, there is NO pat_sel[2:0] from the entry, +* so RTL will always use the value corresponding to +* pat_sel = 000". +* So let's disable cache for GGTT to avoid screen corruptions. +* MOCS still can be used though. +*/ + pat =GEN8_PPAT (0 ,GEN8_PPAT_UC );to override in the unlikely case of disabling ppgtt.
Well GGTT is broken whether or not PPGTT is enabled, so I belive we should just swap two of the entires around WB<->UC, and then update the index defines to match, and CHV needs the same change as well.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 49 lines · Ville Syrjälä
Quoted 37 lines · Chris Wilson
Quoted 22 lines · Rodrigo Vivi
Global GTT doesn't have pat_sel[2:0] so it always point to
pat_sel= 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to
pat_sel= 000"Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
Cc James Ausmus <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0@@ -1911,14 +1911,27 @@ static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv) {drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv) · line 1921
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +0
-8uint64_t pat; - pat =GEN8_PPAT (0 ,GEN8_PPAT_WB |GEN8_PPAT_LLC ) |/* for normal objects, no eLLC */ -GEN8_PPAT (1 ,GEN8_PPAT_WC |GEN8_PPAT_LLCELLC ) |/* for something pointing to ptes? */ -GEN8_PPAT (2 ,GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ) |/* for scanout with eLLC */ -GEN8_PPAT (3 ,GEN8_PPAT_UC ) |/* Uncached objects, mostly for scanout */ -GEN8_PPAT (4 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )) | -GEN8_PPAT (5 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )) | -GEN8_PPAT (6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )) | -GEN8_PPAT (7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 ));Instead of deleting this and making a rather ugly if,
Just
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv) · line 1921
Quoted 8 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +8
-0+if (!USES_PPGTT (dev_priv)) +/* Spec: "For GGTT, there is NO pat_sel[2:0] from the entry, +* so RTL will always use the value corresponding to +* pat_sel = 000". +* So let's disable cache for GGTT to avoid screen corruptions. +* MOCS still can be used though. +*/ + pat =GEN8_PPAT (0 ,GEN8_PPAT_UC );to override in the unlikely case of disabling ppgtt.
Quoted 3 lines
Well GGTT is broken whether or not PPGTT is enabled, so I belive we should just swap two of the entires around WB<->UC, and then update the index defines to match, and CHV needs the same change as well.
I had pondered that. My conclusion was that the only access that actively uses the PTE for cache bits are the render/blitter engines. We impose caching on CPU access by alternative methods. So all we need to force the GPU to disable write caching (WB/WT) when accessing the pages. I had forgotten that we defined the PAT tables, and wondered about a chicken bit that usually exists to force cache modes.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915: Disable caches for Global GTT.
Global GTT doesn't have pat_sel[2:0] so it always point to pat_sel = 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.
MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to pat_sel = 000"
v2: Cleaner patch as suggested by Chris.
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/i915_gem_gtt.c +9 -0
@@ -1920,6 +1920,15 @@ static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv)GEN8_PPAT (6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )) |GEN8_PPAT (7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); +if (!USES_PPGTT (dev_priv->dev)) +/* Spec: "For GGTT, there is NO pat_sel[2:0] from the entry, +* so RTL will always use the value corresponding to +* pat_sel = 000". +* So let's disable cache for GGTT to avoid screen corruptions. +* MOCS still can be used though. +*/ + pat =GEN8_PPAT (0 ,GEN8_PPAT_UC ); +/* XXX: spec defines this as 2 distinct registers. It's unclear if a 64b * write would work. */ I915_WRITE (GEN8_PRIVATE_PAT , pat);
Signature · 6 lines
1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 13 lines · Rodrigo Vivi
Global GTT doesn't have pat_sel[2:0] so it always point to
pat_sel= 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to
pat_sel= 000"v2: Cleaner patch as suggested by Chris.
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
Review
Quoted 8 lines
Cc Chris Wilson <[email protected]>Cc James Ausmus <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 9 +++++++++ 1 file changed, 9 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct
Quoted 4 lines
index cb7adab..ae568a2 100644
drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0@@ -1920,6 +1920,15 @@ static void bdw_setup_private_ppat(struct
drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct · line 1920
Quoted 1 line
drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0GEN8_PPAT(6, GEN8_PPAT_WB | GEN8_PPAT_LLCELLC |
GEN8_PPAT_AGE(2)) |
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct · line 1921
Quoted 1 line
drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0GEN8_PPAT(7, GEN8_PPAT_WB | GEN8_PPAT_LLCELLC |
GEN8_PPAT_AGE(3));
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct · line 1923
Quoted 3 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +2
-0+if (!USES_PPGTT (dev_priv->dev)) +/* Spec: "For GGTT, there is NO pat_sel[2:0] from the
entry,
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv)
Quoted 3 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +3
-0+* so RTL will always use the value corresponding to +* pat_sel = 000". +* So let's disable cache for GGTT to avoid screen
corruptions.
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv)
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +4
-0+* MOCS still can be used though. +*/ + pat =GEN8_PPAT (0 ,GEN8_PPAT_UC ); +/* XXX: spec defines this as 2 distinct registers. It's unclear
if a 64b
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +0
-1* write would work. */ I915_WRITE (GEN8_PRIVATE_PAT , pat); --1.9.3
--
James Ausmus
Sr. Software Engineer
SSG-OTC ChromeOS Integration
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Rodrigo Vivi
Global GTT doesn't have pat_sel[2:0] so it always point to
pat_sel= 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to
pat_sel= 000"
Quoted 6 lines
v2: Cleaner patch as suggested by Chris.
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
Cc Chris Wilson <[email protected]>Cc James Ausmus <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>
Matches my read of BSpec.
Review
Quoted 5 lines
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 9 +++++++++ 1 file changed, 9 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct
Quoted 4 lines
index cb7adab..ae568a2 100644
drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0@@ -1920,6 +1920,15 @@ static void bdw_setup_private_ppat(struct
drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct · line 1920
Quoted 1 line
drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0GEN8_PPAT(6, GEN8_PPAT_WB | GEN8_PPAT_LLCELLC |
GEN8_PPAT_AGE(2)) |
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct · line 1921
Quoted 1 line
drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0GEN8_PPAT(7, GEN8_PPAT_WB | GEN8_PPAT_LLCELLC |
GEN8_PPAT_AGE(3));
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct · line 1923
Quoted 3 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +2
-0+if (!USES_PPGTT (dev_priv->dev)) +/* Spec: "For GGTT, there is NO pat_sel[2:0] from the
entry,
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv)
Quoted 3 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +3
-0+* so RTL will always use the value corresponding to +* pat_sel = 000". +* So let's disable cache for GGTT to avoid screen
corruptions.
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv)
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +4
-0+* MOCS still can be used though. +*/ + pat =GEN8_PPAT (0 ,GEN8_PPAT_UC ); +/* XXX: spec defines this as 2 distinct registers. It's unclear
if a 64b
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +0
-1* write would work. */ I915_WRITE (GEN8_PRIVATE_PAT , pat); --1.9.3
--
James Ausmus
Sr. Software Engineer
SSG-OTC ChromeOS Integration
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Rodrigo Vivi
Global GTT doesn't have pat_sel[2:0] so it always point to
pat_sel= 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
Quoted 6 lines
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to
pat_sel= 000"Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
Cc James Ausmus <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>
Ok, I think this is -fixes + cc: stable material, but we need to be a bit more elaborate on the commit message:
- System agent ggtt writes (i.e. cpu gtt mmaps) already work before this patch, i.e. the same uncached + snooping access like on gen6/7 seems to be in effect.
- So this just fixes blitter/render access. Again it looks like it's not just uncached access, but uncached + snooping. So we can still hold onto all our assumptions wrt cpu clflushing on LLC machines.
I think this should be both in the commit message and code.
Chris, please correct if I've summarized this wrongly.
Thanks, Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915: Disable caches for Global GTT.
Global GTT doesn't have pat_sel[2:0] so it always point to pat_sel = 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.
MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to pat_sel = 000"
- System agent ggtt writes (i.e. cpu gtt mmaps) already work before this patch, i.e. the same uncached + snooping access like on gen6/7 seems to be in effect.
- So this just fixes blitter/render access. Again it looks like it's not just uncached access, but uncached + snooping. So we can still hold onto all our assumptions wrt cpu clflushing on LLC machines.
v2: Cleaner patch as suggested by Chris.
v3: Add Daniel's comment
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/i915/i915_gem_gtt.c +16 -0
@@ -1920,6 +1920,22 @@ static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv)GEN8_PPAT (6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )) |GEN8_PPAT (7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); +if (!USES_PPGTT (dev_priv->dev)) +/* Spec: "For GGTT, there is NO pat_sel[2:0] from the entry, +* so RTL will always use the value corresponding to +* pat_sel = 000". +* So let's disable cache for GGTT to avoid screen corruptions. +* MOCS still can be used though. +* - System agent ggtt writes (i.e. cpu gtt mmaps) already work +* before this patch, i.e. the same uncached + snooping access +* like on gen6/7 seems to be in effect. +* - So this just fixes blitter/render access. Again it looks +* like it's not just uncached access, but uncached + snooping. +* So we can still hold onto all our assumptions wrt cpu +* clflushing on LLC machines. +*/ + pat =GEN8_PPAT (0 ,GEN8_PPAT_UC ); +/* XXX: spec defines this as 2 distinct registers. It's unclear if a 64b * write would work. */ I915_WRITE (GEN8_PRIVATE_PAT , pat);
Signature · 6 lines
1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 20 lines · Rodrigo Vivi
Global GTT doesn't have pat_sel[2:0] so it always point to
pat_sel= 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to
pat_sel= 000"- System agent ggtt writes (i.e. cpu gtt mmaps) already work before this patch, i.e. the same uncached + snooping access like on gen6/7 seems to be in effect.
- So this just fixes blitter/render access. Again it looks like it's not just uncached access, but uncached + snooping. So we can still hold onto all our assumptions wrt cpu clflushing on LLC machines.v2: Cleaner patch as suggested by Chris.
v3: Add Daniel's commentReference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
Quoted 8 lines
Cc Chris Wilson <[email protected]>Cc James Ausmus <[email protected]>Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Tested-by James Ausmus <[email protected]>Reviewed-by James Ausmus <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>
Pushed this one to drm-intel-fixes as-is, thanks for the patch, review, and bikeshedding. :p
BR,
Jani.
Quoted 34 lines
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)drivers/gpu/drm/i915/i915_gem_gtt.c +16
-0@@ -1920,6 +1920,22 @@ static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv)GEN8_PPAT (6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )) |GEN8_PPAT (7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); +if (!USES_PPGTT (dev_priv->dev)) +/* Spec: "For GGTT, there is NO pat_sel[2:0] from the entry, +* so RTL will always use the value corresponding to +* pat_sel = 000". +* So let's disable cache for GGTT to avoid screen corruptions. +* MOCS still can be used though. +* - System agent ggtt writes (i.e. cpu gtt mmaps) already work +* before this patch, i.e. the same uncached + snooping access +* like on gen6/7 seems to be in effect. +* - So this just fixes blitter/render access. Again it looks +* like it's not just uncached access, but uncached + snooping. +* So we can still hold onto all our assumptions wrt cpu +* clflushing on LLC machines. +*/ + pat =GEN8_PPAT (0 ,GEN8_PPAT_UC ); +/* XXX: spec defines this as 2 distinct registers. It's unclear if a 64b * write would work. */ I915_WRITE (GEN8_PRIVATE_PAT , pat);Signature · 1 line
1.9.3
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Quoted 24 lines · Daniel Vetter
Quoted 6 lines · Rodrigo Vivi
Global GTT doesn't have pat_sel[2:0] so it always point to
pat_sel= 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
Quoted 6 lines
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to
pat_sel= 000"Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
Cc James Ausmus <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Ok, I think this is -fixes + cc: stable material, but we need to be a bit more elaborate on the commit message:
- System agent ggtt writes (i.e. cpu gtt mmaps) already work before this patch, i.e. the same uncached + snooping access like on gen6/7 seems to be in effect.
- So this just fixes blitter/render access. Again it looks like it's not just uncached access, but uncached + snooping. So we can still hold onto all our assumptions wrt cpu clflushing on LLC machines.
Quoted 3 lines
I think this should be both in the commit message and code.
Chris, please correct if I've summarized this wrongly.
Me, I just get confused by the statement that writes through the System Agent to main memory are snooped.
But the statement that GTT + WC is coherent with the display as it was on SNB+ is certainly true.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 27 lines · Chris Wilson
Quoted 26 lines · Daniel Vetter
Quoted 6 lines · Rodrigo Vivi
Global GTT doesn't have pat_sel[2:0] so it always point to
pat_sel= 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
Quoted 6 lines
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to
pat_sel= 000"Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
Cc James Ausmus <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Ok, I think this is -fixes + cc: stable material, but we need to be a bit more elaborate on the commit message:
- System agent ggtt writes (i.e. cpu gtt mmaps) already work before this patch, i.e. the same uncached + snooping access like on gen6/7 seems to be in effect.
- So this just fixes blitter/render access. Again it looks like it's not just uncached access, but uncached + snooping. So we can still hold onto all our assumptions wrt cpu clflushing on LLC machines.I think this should be both in the commit message and code.
Quoted 7 lines
Quoted 1 line
Chris, please correct if I've summarized this wrongly.
Me, I just get confused by the statement that writes through the System Agent to main memory are snooped.
But the statement that GTT + WC is coherent with the display as it was on SNB+ is certainly true.
I have a supicious mind so I simply had to go and verify this on my IVB. Writes to a LLC cacheable scanout buffer through a GTT mmap did not result in any cache dirt on the screen. So I must admit defeat.
I also did another experiment where I wrote the data through a cpu mmap, which obviously resulted in plenty of cache dirt. But I then followed it with a read through the GTT mmap (obj still mapped as cacheable in GTT), and the data matched what I wrote, and it also cleared the cache dirt from the screen. So any CPU GTT access will snoop the caches and also causes a writeback of the cacheline. I suspect it also invalidates the cacheline, but I didn't verify that in any way.
So I guess I can rest easier now having witnessed it all with mine own eyes :)
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 49 lines · Ville Syrjälä
Quoted 27 lines · Chris Wilson
Quoted 26 lines · Daniel Vetter
Quoted 6 lines · Rodrigo Vivi
Global GTT doesn't have pat_sel[2:0] so it always point to
pat_sel= 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
Quoted 6 lines
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to
pat_sel= 000"Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
Cc James Ausmus <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Ok, I think this is -fixes + cc: stable material, but we need to be a bit more elaborate on the commit message:
- System agent ggtt writes (i.e. cpu gtt mmaps) already work before this patch, i.e. the same uncached + snooping access like on gen6/7 seems to be in effect.
- So this just fixes blitter/render access. Again it looks like it's not just uncached access, but uncached + snooping. So we can still hold onto all our assumptions wrt cpu clflushing on LLC machines.I think this should be both in the commit message and code.
Quoted 7 lines
Quoted 1 line
Chris, please correct if I've summarized this wrongly.
Me, I just get confused by the statement that writes through the System Agent to main memory are snooped.
But the statement that GTT + WC is coherent with the display as it was on SNB+ is certainly true.
I have a supicious mind so I simply had to go and verify this on my IVB. Writes to a LLC cacheable scanout buffer through a GTT mmap did not result in any cache dirt on the screen. So I must admit defeat.
I also did another experiment where I wrote the data through a cpu mmap, which obviously resulted in plenty of cache dirt. But I then followed it with a read through the GTT mmap (obj still mapped as cacheable in GTT), and the data matched what I wrote, and it also cleared the cache dirt from the screen. So any CPU GTT access will snoop the caches and also causes a writeback of the cacheline. I suspect it also invalidates the cacheline, but I didn't verify that in any way.
Quoted 2 lines
So I guess I can rest easier now having witnessed it all with mine own eyes :)
I also repeated the same tests on CHV, and it behaves in a manner consistent with its non-LLC heritage ie. CPU GTT access never snoops no matter what the PTE says.
I also frobbed with the PAT entries a bit, and that at least confirms that status page writes go through PAT[0] even though we set up the PTEs to use PAT[4]. When PTE[0] doesn't have the snoop bit, all we get is a GPU "hang", and with the snoop bit set things work fine.
So I think that for CHV the ppgtt=0 case is perfectly fine with the current code because:
1) CPU GTT access is fine as it never snoops and we expect it not to, in fact we hand a SIGBUS to anyone who tries this
2) GPU access to snooped bo will work since PAT[0] says to snoop
3) GPU access to non-snooped bo will work even if PAT[0] says to snoop, but will perhaps be a bit slow due to the extra snoops. Should be able to override with MOCS though and get the speed back.
4) Status page must be snooped, so things pretty much fall apart when PAT[0] doesn't have the snoop bit. Well, unless we decide to add explicit cache flushes to status page reads
I'm not entirely sure if I should be coserned about the color_adjust stuff, especially in the case where MOCS is used. We might end up mixing snooped and non-snooped accesses in a way that the color adjustment wasn't able to anticipate. I guess I could just try to see if I can anger the hardware doing that. But that's a job or another day.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 62 lines · Ville Syrjälä
Quoted 49 lines · Ville Syrjälä
Quoted 27 lines · Chris Wilson
Quoted 26 lines · Daniel Vetter
Quoted 6 lines · Rodrigo Vivi
Global GTT doesn't have pat_sel[2:0] so it always point to
pat_sel= 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
Quoted 6 lines
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to
pat_sel= 000"Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
Cc James Ausmus <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Ok, I think this is -fixes + cc: stable material, but we need to be a bit more elaborate on the commit message:
- System agent ggtt writes (i.e. cpu gtt mmaps) already work before this patch, i.e. the same uncached + snooping access like on gen6/7 seems to be in effect.
- So this just fixes blitter/render access. Again it looks like it's not just uncached access, but uncached + snooping. So we can still hold onto all our assumptions wrt cpu clflushing on LLC machines.I think this should be both in the commit message and code.
Quoted 7 lines
Quoted 1 line
Chris, please correct if I've summarized this wrongly.
Me, I just get confused by the statement that writes through the System Agent to main memory are snooped.
But the statement that GTT + WC is coherent with the display as it was on SNB+ is certainly true.
I have a supicious mind so I simply had to go and verify this on my IVB. Writes to a LLC cacheable scanout buffer through a GTT mmap did not result in any cache dirt on the screen. So I must admit defeat.
I also did another experiment where I wrote the data through a cpu mmap, which obviously resulted in plenty of cache dirt. But I then followed it with a read through the GTT mmap (obj still mapped as cacheable in GTT), and the data matched what I wrote, and it also cleared the cache dirt from the screen. So any CPU GTT access will snoop the caches and also causes a writeback of the cacheline. I suspect it also invalidates the cacheline, but I didn't verify that in any way.
Quoted 2 lines
So I guess I can rest easier now having witnessed it all with mine own eyes :)
I also repeated the same tests on CHV, and it behaves in a manner consistent with its non-LLC heritage ie. CPU GTT access never snoops no matter what the PTE says.
I also frobbed with the PAT entries a bit, and that at least confirms that status page writes go through PAT[0] even though we set up the PTEs to use PAT[4]. When PTE[0] doesn't have the snoop bit, all we get is a GPU "hang", and with the snoop bit set things work fine.
Quoted 11 lines
So I think that for CHV the ppgtt=0 case is perfectly fine with the current code because:
1) CPU GTT access is fine as it never snoops and we expect it not to, in fact we hand a SIGBUS to anyone who tries this
2) GPU access to snooped bo will work since PAT[0] says to snoop
3) GPU access to non-snooped bo will work even if PAT[0] says to snoop, but will perhaps be a bit slow due to the extra snoops. Should be able to override with MOCS though and get the speed back.
4) Status page must be snooped, so things pretty much fall apart when PAT[0] doesn't have the snoop bit. Well, unless we decide to add explicit cache flushes to status page reads
Great job! Thanks for verifying that deeply.
I wasn't really sure about how we are setting the entire PAT table, but with your tests I'm confident we are in the right direction.
Quoted 5 lines
I'm not entirely sure if I should be coserned about the
color_adjuststuff, especially in the case where MOCS is used. We might end up mixing snooped and non-snooped accesses in a way that the color adjustment wasn't able to anticipate.
uhm... interesting point.
Quoted 3 lines
I guess I could just try to
see if I can anger the hardware doing that. But that's a job or another day.
indeed! :)
Quoted 8 lines
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 62 lines · Ville Syrjälä
Quoted 49 lines · Ville Syrjälä
Quoted 27 lines · Chris Wilson
Quoted 26 lines · Daniel Vetter
Quoted 6 lines · Rodrigo Vivi
Global GTT doesn't have pat_sel[2:0] so it always point to
pat_sel= 000; So the only way to avoid screen corruptions is setting PAT 0 to Uncached.MOCS can still be used though. But if userspace is trusting PTE for cache selection the safest thing to do is to let caches disabled.
Quoted 6 lines
BSpec: "For GGTT, there is NO pat_sel[2:0] from the entry, so RTL will always use the value corresponding to
pat_sel= 000"Reference: https://bugs.freedesktop.org/show_bug.cgi?id=85576
Cc James Ausmus <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Ok, I think this is -fixes + cc: stable material, but we need to be a bit more elaborate on the commit message:
- System agent ggtt writes (i.e. cpu gtt mmaps) already work before this patch, i.e. the same uncached + snooping access like on gen6/7 seems to be in effect.
- So this just fixes blitter/render access. Again it looks like it's not just uncached access, but uncached + snooping. So we can still hold onto all our assumptions wrt cpu clflushing on LLC machines.I think this should be both in the commit message and code.
Quoted 7 lines
Quoted 1 line
Chris, please correct if I've summarized this wrongly.
Me, I just get confused by the statement that writes through the System Agent to main memory are snooped.
But the statement that GTT + WC is coherent with the display as it was on SNB+ is certainly true.
I have a supicious mind so I simply had to go and verify this on my IVB. Writes to a LLC cacheable scanout buffer through a GTT mmap did not result in any cache dirt on the screen. So I must admit defeat.
I also did another experiment where I wrote the data through a cpu mmap, which obviously resulted in plenty of cache dirt. But I then followed it with a read through the GTT mmap (obj still mapped as cacheable in GTT), and the data matched what I wrote, and it also cleared the cache dirt from the screen. So any CPU GTT access will snoop the caches and also causes a writeback of the cacheline. I suspect it also invalidates the cacheline, but I didn't verify that in any way.
Quoted 2 lines
So I guess I can rest easier now having witnessed it all with mine own eyes :)
I also repeated the same tests on CHV, and it behaves in a manner consistent with its non-LLC heritage ie. CPU GTT access never snoops no matter what the PTE says.
I also frobbed with the PAT entries a bit, and that at least confirms that status page writes go through PAT[0] even though we set up the PTEs to use PAT[4]. When PTE[0] doesn't have the snoop bit, all we get is a GPU "hang", and with the snoop bit set things work fine.
Quoted 11 lines
So I think that for CHV the ppgtt=0 case is perfectly fine with the current code because:
1) CPU GTT access is fine as it never snoops and we expect it not to, in fact we hand a SIGBUS to anyone who tries this
2) GPU access to snooped bo will work since PAT[0] says to snoop
3) GPU access to non-snooped bo will work even if PAT[0] says to snoop, but will perhaps be a bit slow due to the extra snoops. Should be able to override with MOCS though and get the speed back.
4) Status page must be snooped, so things pretty much fall apart when PAT[0] doesn't have the snoop bit. Well, unless we decide to add explicit cache flushes to status page reads
I think a patch which adds a comment to the chv pat code stating that pat[0] must be cached would be great. Otherwise someone will go and "clean" it up I fear ...
Quoted 6 lines
I'm not entirely sure if I should be coserned about the
color_adjuststuff, especially in the case where MOCS is used. We might end up mixing snooped and non-snooped accesses in a way that the color adjustment wasn't able to anticipate. I guess I could just try to see if I can anger the hardware doing that. But that's a job or another day.
tbh I'm not sure any more whether we still need this on vlv/chv - they did change the snooping logic a lot. Iirc pre-gen5 only could snoop with the blitter, vlv/chv can also snoop with the render engine. So maybe this has improved enough that we don't need the color stuff any more.
I guess a good test would be to disable the color stuff on vlv/chv and see what happens ...
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Daniel Vetter
tbh I'm not sure any more whether we still need this on vlv/chv - they did change the snooping logic a lot. Iirc pre-gen5 only could snoop with the blitter, vlv/chv can also snoop with the render engine. So maybe this has improved enough that we don't need the color stuff any more.
gen2+ snoops with the sampler as well.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx