drm/i915: Fix the missing PPAT cache attributes on CNL
Subsystems (2)
PATCH 1/4 drm/i915: Fix the missing PPAT cache attributes on CNL
Add back the GEN8_PPAT_WB cache attributes in cnl_setup_private_ppat(), which are missed on CNL.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +4 -4
@@ -2828,10 +2828,10 @@ static void cnl_setup_private_ppat(struct drm_i915_private *dev_priv)I915_WRITE (GEN10_PAT_INDEX (1 ),GEN8_PPAT_WC |GEN8_PPAT_LLCELLC );I915_WRITE (GEN10_PAT_INDEX (2 ),GEN8_PPAT_WT |GEN8_PPAT_LLCELLC );I915_WRITE (GEN10_PAT_INDEX (3 ),GEN8_PPAT_UC ); -I915_WRITE (GEN10_PAT_INDEX (4 ),GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); -I915_WRITE (GEN10_PAT_INDEX (5 ),GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )); -I915_WRITE (GEN10_PAT_INDEX (6 ),GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )); -I915_WRITE (GEN10_PAT_INDEX (7 ),GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); +I915_WRITE (GEN10_PAT_INDEX (4 ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); +I915_WRITE (GEN10_PAT_INDEX (5 ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )); +I915_WRITE (GEN10_PAT_INDEX (6 ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )); +I915_WRITE (GEN10_PAT_INDEX (7 ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); }/* The GGTT and PPGTT need a private PPAT setup in order to handle cacheability
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/4 drm/i915: Factor out setup_private_pat()
Factor out setup_private_pat() for introducing the following patches.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +12 -8
@@ -2915,6 +2915,16 @@ static void gen6_gmch_remove(struct i915_address_space *vm)cleanup_scratch_page (vm); } +static void setup_private_pat (struct drm_i915_private *dev_priv) +{ +if (INTEL_GEN (dev_priv) >=10 ) +cnl_setup_private_ppat (dev_priv); +else if (IS_CHERRYVIEW (dev_priv) ||IS_GEN9_LP (dev_priv)) +chv_setup_private_ppat (dev_priv); +else +bdw_setup_private_ppat (dev_priv); +} +static int gen8_gmch_probe (struct i915_ggtt *ggtt) {struct drm_i915_private *dev_priv = ggtt->base.i915;
@@ -2947,14 +2957,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) } ggtt->base.total = (size /sizeof (gen8_pte_t)) <<PAGE_SHIFT ; - -if (INTEL_GEN (dev_priv) >=10 ) -cnl_setup_private_ppat (dev_priv); -else if (IS_CHERRYVIEW (dev_priv) ||IS_GEN9_LP (dev_priv)) -chv_setup_private_ppat (dev_priv); -else -bdw_setup_private_ppat (dev_priv); - ggtt->base.cleanup = gen6_gmch_remove; ggtt->base.bind_vma = ggtt_bind_vma; ggtt->base.unbind_vma = ggtt_unbind_vma;
@@ -2975,6 +2977,8 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) ggtt->invalidate = gen6_ggtt_invalidate; +setup_private_pat (dev_priv); +return ggtt_probe_common (ggtt, size); }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/4 drm/i915: Introduce private PAT management
In reply to Zhi WangThe private PAT management is to support PPAT entry manipulation. Two APIs are introduced for dynamically managing PPAT entries: intel_ppat_get and intel_ppat_put.
intel_ppat_get will search for an existing PPAT entry which perfectly matches the required PPAT value. If not, it will try to allocate or return a partially matched PPAT entry if there is any available PPAT indexes or not.
intel_ppat_put will put back the PPAT entry which comes from intel_ppat_get. If it's dynamically allocated, the reference count will be decreased. If the reference count turns into zero, the PPAT index is freed again.
Besides, another two callbacks are introduced to support the private PAT management framework. One is ppat->update_hw(), which writes the PPAT configurations in ppat->entries into HW. Another one is ppat->match, which will return a score to show how two PPAT values match with each other.
v7:
- Keep all the register writes unchanged in this patch. (Joonas)
v6:
- Address all comments from Chris:
http://www.spinics.net/lists/intel-gfx/msg136850.html
- Address all comments from Joonas:
http://www.spinics.net/lists/intel-gfx/msg136845.html
v5:
- Add check and warnnings for those platforms which don't have PPAT.
v3:
- Introduce dirty bitmap for PPAT registers. (Chris)
- Change the name of the pointer "dev_priv" to "i915". (Chris)
- intel_ppat_{get, put} returns/takes a const intel_ppat_entry *. (Chris)
v2:
- API re-design. (Chris)
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_gem_gtt.c | 279 +++++++++++++++++++++++++++++------- drivers/gpu/drm/i915/i915_gem_gtt.h | 36 +++++ 3 files changed, 268 insertions(+), 49 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2312,6 +2312,8 @@ struct drm_i915_private {DECLARE_HASHTABLE (mm_structs,7 );struct mutex mm_lock; +struct intel_ppat ppat; +/* Kernel Modesetting */ struct intel_crtc *plane_to_crtc_mapping[I915_MAX_PIPES ];
drivers/gpu/drm/i915/i915_gem_gtt.c +230 -49
330 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_gtt.h +36 -0
@@ -143,6 +143,11 @@ typedef u64 gen8_ppgtt_pml4e_t;#define GEN8_PPAT_ELLC_OVERRIDE (0<<2)#define GEN8_PPAT (i, x) ((u64)(x) << ((i) * 8)) +#define GEN8_PPAT_GET_CA (x) ((x) & 3) +#define GEN8_PPAT_GET_TC (x) ((x) & (3 << 2)) +#define GEN8_PPAT_GET_AGE (x) ((x) & (3 << 4)) +#define CHV_PPAT_GET_SNOOP (x) ((x) & (1 << 6)) +struct sg_table ;struct intel_rotation_info {
@@ -536,6 +541,37 @@ i915_vm_to_ggtt(struct i915_address_space *vm) return container_of(vm, struct i915_ggtt, base); } +#define INTEL_MAX_PPAT_ENTRIES 8 +#define INTEL_PPAT_PERFECT_MATCH (~0U) + +struct intel_ppat ; + +struct intel_ppat_entry { +struct intel_ppat *ppat; +struct kref ref; +u8 value; +}; + +struct intel_ppat { +struct intel_ppat_entry entries[INTEL_MAX_PPAT_ENTRIES ]; + DECLARE_BITMAP(used, INTEL_MAX_PPAT_ENTRIES); + DECLARE_BITMAP(dirty, INTEL_MAX_PPAT_ENTRIES); +unsigned int max_entries; +u8 clear_value; +/* +* Return a score to show how two PPAT values match, +* a INTEL_PPAT_PERFECT_MATCH indicates a perfect match +*/ +unsigned int (*match)(u8 src,u8 dst); +void (*update_hw)(struct drm_i915_private *i915); + +struct drm_i915_private *i915; +}; + +const struct intel_ppat_entry * +intel_ppat_get (struct drm_i915_private *i915,u8 value); +void intel_ppat_put (const struct intel_ppat_entry *entry); +int i915_gem_init_aliasing_ppgtt (struct drm_i915_private *i915);void i915_gem_fini_aliasing_ppgtt (struct drm_i915_private *i915);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/4 drm/i915: Do not allocate unused PPAT entries
In reply to Zhi WangOnly PPAT entries 0/2/3/4 are using. Remove extra PPAT entry allocation during initialization.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 46 ++++++++++++++++--------------------- drivers/gpu/drm/i915/i915_gem_gtt.h | 7 ++++++ 2 files changed, 27 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +20 -26
@@ -2988,18 +2988,15 @@ static void cnl_setup_private_ppat(struct intel_ppat *ppat)/* XXX: spec is unclear if this is still needed for CNL+ */ if (!USES_PPGTT (ppat->i915)) { -__alloc_ppat_entry (ppat,0 ,GEN8_PPAT_UC ); +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_CACHED_PDE_INDEX ),GEN8_PPAT_UC );return ; } -__alloc_ppat_entry (ppat,0 ,GEN8_PPAT_WB |GEN8_PPAT_LLC ); -__alloc_ppat_entry (ppat,1 ,GEN8_PPAT_WC |GEN8_PPAT_LLCELLC ); -__alloc_ppat_entry (ppat,2 ,GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ); -__alloc_ppat_entry (ppat,3 ,GEN8_PPAT_UC ); -__alloc_ppat_entry (ppat,4 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); -__alloc_ppat_entry (ppat,5 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )); -__alloc_ppat_entry (ppat,6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )); -__alloc_ppat_entry (ppat,7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); +/* See gen8_pte_encode() for the mapping from cache-level to PPAT */ +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_CACHED_PDE_INDEX ),GEN8_PPAT_WB |GEN8_PPAT_LLC ); +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_DISPLAY_ELLC_INDEX ),GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ); +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_UNCACHED_INDEX ),GEN8_PPAT_UC ); +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_CACHED_INDEX ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); }/* The GGTT and PPGTT need a private PPAT setup in order to handle cacheability
@@ -3026,18 +3023,18 @@ static void bdw_setup_private_ppat(struct intel_ppat *ppat)* So we can still hold onto all our assumptions wrt cpu * clflushing on LLC machines. */ -__alloc_ppat_entry (ppat,0 ,GEN8_PPAT_UC ); +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_CACHED_PDE_INDEX ),GEN8_PPAT_UC );return ; } -__alloc_ppat_entry (ppat,0 ,GEN8_PPAT_WB |GEN8_PPAT_LLC );/* for normal objects, no eLLC */ -__alloc_ppat_entry (ppat,1 ,GEN8_PPAT_WC |GEN8_PPAT_LLCELLC );/* for something pointing to ptes? */ -__alloc_ppat_entry (ppat,2 ,GEN8_PPAT_WT |GEN8_PPAT_LLCELLC );/* for scanout with eLLC */ -__alloc_ppat_entry (ppat,3 ,GEN8_PPAT_UC );/* Uncached objects, mostly for scanout */ -__alloc_ppat_entry (ppat,4 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); -__alloc_ppat_entry (ppat,5 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )); -__alloc_ppat_entry (ppat,6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )); -__alloc_ppat_entry (ppat,7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); +/* See gen8_pte_encode() for the mapping from cache-level to PPAT */ +/* for normal objects, no eLLC */ +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_CACHED_PDE_INDEX ),GEN8_PPAT_WB |GEN8_PPAT_LLC ); +/* for scanout with eLLC */ +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_DISPLAY_ELLC_INDEX ),GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ); +/* Uncached objects, mostly for scanout */ +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_UNCACHED_INDEX ),GEN8_PPAT_UC ); +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_CACHED_INDEX ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); }static void chv_setup_private_ppat (struct intel_ppat *ppat)
@@ -3066,14 +3063,11 @@ static void chv_setup_private_ppat(struct intel_ppat *ppat)* in order to keep the global status page working. */ -__alloc_ppat_entry (ppat,0 ,CHV_PPAT_SNOOP ); -__alloc_ppat_entry (ppat,1 ,0 ); -__alloc_ppat_entry (ppat,2 ,0 ); -__alloc_ppat_entry (ppat,3 ,0 ); -__alloc_ppat_entry (ppat,4 ,CHV_PPAT_SNOOP ); -__alloc_ppat_entry (ppat,5 ,CHV_PPAT_SNOOP ); -__alloc_ppat_entry (ppat,6 ,CHV_PPAT_SNOOP ); -__alloc_ppat_entry (ppat,7 ,CHV_PPAT_SNOOP ); +/* See gen8_pte_encode() for the mapping from cache-level to PPAT */ +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_CACHED_PDE_INDEX ),CHV_PPAT_SNOOP ); +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_DISPLAY_ELLC_INDEX ),0 ); +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_UNCACHED_INDEX ),0 ); +__alloc_ppat_entry (ppat,ppat_bits_to_index (PPAT_CACHED_INDEX ),CHV_PPAT_SNOOP ); }static void gen6_gmch_remove (struct i915_address_space *vm)
drivers/gpu/drm/i915/i915_gem_gtt.h +7 -0
@@ -131,6 +131,13 @@ typedef u64 gen8_ppgtt_pml4e_t;#define PPAT_CACHED_INDEX _PAGE_PAT/* WB LLCeLLC */ #define PPAT_DISPLAY_ELLC_INDEX _PAGE_PCD/* WT eLLC */ +/* PPAT index = 4 * PAT + 2 * PCD + PWT */ +static inline unsigned int ppat_bits_to_index (unsigned int bits) +{ +return (4 * !!(bits & _PAGE_PAT) +2 * !!(bits & _PAGE_PCD) + + !!(bits & _PAGE_PWT)); +} +#define CHV_PPAT_SNOOP (1<<6)#define GEN8_PPAT_AGE (x) (x<<4)#define GEN8_PPAT_LLCeLLC (3<<2)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/4] drm/i915: Fix the missing PPAT cache attributes on CNL
In reply to Zhi Wang== Series Details ==
== Series Details ==
Series: series starting with [1/4] drm/i915: Fix the missing PPAT cache attributes on CNL
URL : https://patchwork.freedesktop.org/series/29625/
State : success
== Summary ==
Series 29625v1 series starting with [1/4] drm/i915: Fix the missing PPAT cache attributes on CNL
https://patchwork.freedesktop.org/api/1.0/series/29625/revisions/1/mbox/
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
fail -> PASS (fi-snb-2600) fdo#100215fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fi-bdw-5557u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:454s fi-bdw-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:444s fi-blb-e6850 total:288 pass:224 dwarn:1 dfail:0 fail:0 skip:63 time:360s fi-bsw-n3050 total:288 pass:243 dwarn:0 dfail:0 fail:0 skip:45 time:565s fi-bwr-2160 total:288 pass:184 dwarn:0 dfail:0 fail:0 skip:104 time:255s fi-bxt-j4205 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:520s fi-byt-j1900 total:288 pass:254 dwarn:1 dfail:0 fail:0 skip:33 time:519s fi-byt-n2820 total:288 pass:250 dwarn:1 dfail:0 fail:0 skip:37 time:513s fi-elk-e7500 total:288 pass:230 dwarn:0 dfail:0 fail:0 skip:58 time:440s fi-glk-2a total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:612s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:2 skip:25 time:462s fi-hsw-4770r total:288 pass:263 dwarn:0 dfail:0 fail:0 skip:25 time:425s fi-ilk-650 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:430s fi-ivb-3520m total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:498s fi-ivb-3770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:475s fi-kbl-7500u total:288 pass:264 dwarn:1 dfail:0 fail:0 skip:23 time:512s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:598s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:596s fi-pnv-d510 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:534s fi-skl-6260u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:476s fi-skl-6700k total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:531s fi-skl-6770hq total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:492s fi-skl-gvtdvm total:288 pass:266 dwarn:0 dfail:0 fail:0 skip:22 time:440s fi-skl-x1585l total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:492s fi-snb-2520m total:288 pass:251 dwarn:0 dfail:0 fail:0 skip:37 time:552s fi-snb-2600 total:288 pass:250 dwarn:0 dfail:0 fail:0 skip:38 time:400s
ccf4ca2d93383fe1a234aba83df9c21400216433 drm-tip: 2017y-08m-31d-18h-37m-46s UTC integration manifest ab2d80605ded drm/i915: Do not allocate unused PPAT entries28bf9054fe62 drm/i915: Introduce private PAT management9158415d66aa drm/i915: Factor out setup_private_pat()32d0d72d1732 drm/i915: Fix the missing PPAT cache attributes on CNL
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5551/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [1/4] drm/i915: Fix the missing PPAT cache attributes on CNL
In reply to Zhi Wang== Series Details ==
== Series Details ==
Series: series starting with [1/4] drm/i915: Fix the missing PPAT cache attributes on CNL
URL : https://patchwork.freedesktop.org/series/29625/
State : success
== Summary ==
Test perf:
Subgroup polling:
fail -> PASS (shard-hsw) fdo#102252fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2265 pass:1233 dwarn:0 dfail:0 fail:16 skip:1016 time:9628s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5551/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Zhi Wang
Add back the
GEN8_PPAT_WBcache attributes incnl_setup_private_ppat(), which are missed on CNL.Fixes e34935 ("drm/i915/cnl: Setup PAT Index")
missing some numbers....
Quoted 5 lines
Cc Ben Widawsky <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Chris Wilson <[email protected]>Suggested-by Joonas Lahtinen <[email protected]>Signed-off-by Zhi Wang <[email protected]>
I also tested here on my CNL so I'm going to merge here this first patch. Thanks a lot.
Quoted 30 lines
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +4
-5@@ -2828,10 +2828,10 @@ static void cnl_setup_private_ppat(struct drm_i915_private *dev_priv)I915_WRITE (GEN10_PAT_INDEX (1 ),GEN8_PPAT_WC |GEN8_PPAT_LLCELLC );I915_WRITE (GEN10_PAT_INDEX (2 ),GEN8_PPAT_WT |GEN8_PPAT_LLCELLC );I915_WRITE (GEN10_PAT_INDEX (3 ),GEN8_PPAT_UC ); -I915_WRITE (GEN10_PAT_INDEX (4 ),GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); -I915_WRITE (GEN10_PAT_INDEX (5 ),GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )); -I915_WRITE (GEN10_PAT_INDEX (6 ),GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )); -I915_WRITE (GEN10_PAT_INDEX (7 ),GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); +I915_WRITE (GEN10_PAT_INDEX (4 ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); +I915_WRITE (GEN10_PAT_INDEX (5 ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )); +I915_WRITE (GEN10_PAT_INDEX (6 ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )); +I915_WRITE (GEN10_PAT_INDEX (7 ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); }/* The GGTT and PPGTT need a private PPAT setup in order to handle cacheability -- 2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Wang, Zhi A
Reviewed-by Rodrigo ViviThanks for merging the patch and test. :)
-----Original Message-----
From: Rodrigo Vivi [mailto:[email protected]]
Sent: Saturday, September 2, 2017 3:01 AM
To: Wang, Zhi A <[email protected]>
Cc: intel-gfx <[email protected]>; [email protected]; Vivi, Rodrigo <[email protected]>; Widawsky, Benjamin <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/4] drm/i915: Fix the missing PPAT cache attributes on CNL
Quoted 4 lines · Zhi Wang
Add back the
GEN8_PPAT_WBcache attributes incnl_setup_private_ppat(), which are missed on CNL.Fixes e34935 ("drm/i915/cnl: Setup PAT Index")
missing some numbers....
Quoted 5 lines
Cc Ben Widawsky <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Chris Wilson <[email protected]>Suggested-by Joonas Lahtinen <[email protected]>Signed-off-by Zhi Wang <[email protected]>
I also tested here on my CNL so I'm going to merge here this first patch. Thanks a lot.
Quoted 29 lines
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +5
-4@@ -2828,10 +2828,10 @@ static void cnl_setup_private_ppat(struct drm_i915_private *dev_priv)I915_WRITE (GEN10_PAT_INDEX (1 ),GEN8_PPAT_WC |GEN8_PPAT_LLCELLC );I915_WRITE (GEN10_PAT_INDEX (2 ),GEN8_PPAT_WT |GEN8_PPAT_LLCELLC );I915_WRITE (GEN10_PAT_INDEX (3 ),GEN8_PPAT_UC ); -I915_WRITE (GEN10_PAT_INDEX (4 ),GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); -I915_WRITE (GEN10_PAT_INDEX (5 ),GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )); -I915_WRITE (GEN10_PAT_INDEX (6 ),GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )); -I915_WRITE (GEN10_PAT_INDEX (7 ),GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); +I915_WRITE (GEN10_PAT_INDEX (4 ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); +I915_WRITE (GEN10_PAT_INDEX (5 ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )); +I915_WRITE (GEN10_PAT_INDEX (6 ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )); +I915_WRITE (GEN10_PAT_INDEX (7 ),GEN8_PPAT_WB | +GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); }/* The GGTT and PPGTT need a private PPAT setup in order to handle cacheability
--
2.7.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx