Introduce private PAT management
Subsystems (2)
v3 cover Introduce private PAT management
This patchset introduces private PPAT managment which enables dynamically configuring PPAT at runtime. The previous static PPAT configuration is kept unchanged.
More background of this patchset can be found at:
https://lists.freedesktop.org/archives/intel-gfx/2017-August/135415.html
v3:
- Remove intel_ppat_reserved. (Chris)
v2:
- Rewrite the i915 parts after discussing with Chris. Now PPAT management sits in i915.
Zhi Wang (3):
drm/i915: Factor out setup_private_pat() drm/i915: Introduce private PAT management drm/i915: Introduce per-platform PPAT configurations
drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_gem_gtt.c | 275 +++++++++++++++++++++++++++++------- drivers/gpu/drm/i915/i915_gem_gtt.h | 35 +++++ 3 files changed, 258 insertions(+), 54 deletions(-)
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 Introduce private PAT management (rev2)
== Series Details ==
== Series Details ==
Series: Introduce private PAT management (rev2)
URL : https://patchwork.freedesktop.org/series/29166/
State : success
== Summary ==
Series 29166v2 Introduce private PAT management
https://patchwork.freedesktop.org/api/1.0/series/29166/revisions/2/mbox/
Test kms_flip:
Subgroup basic-flip-vs-modeset:
skip -> PASS (fi-skl-x1585l) fdo#101781fdo#101781 https://bugs.freedesktop.org/show_bug.cgi?id=101781
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:454s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:437s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:358s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:545s fi-bwr-2160 total:279 pass:184 dwarn:0 dfail:0 fail:0 skip:95 time:253s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:518s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:524s fi-elk-e7500 total:279 pass:230 dwarn:0 dfail:0 fail:0 skip:49 time:436s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:610s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:443s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:424s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:420s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:504s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:475s fi-kbl-7260u total:279 pass:268 dwarn:1 dfail:0 fail:0 skip:10 time:498s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:481s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:607s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:601s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:532s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:470s fi-skl-6700k total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:485s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:484s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:444s fi-skl-x1585l total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:503s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:547s fi-snb-2600 total:279 pass:250 dwarn:0 dfail:0 fail:0 skip:29 time:407s
489147dfdcc735baf773a6ec3698cf85a01d7008 drm-tip: 2017y-08m-22d-18h-44m-32s UTC integration manifest 5eac05bc6d87 drm/i915: Introduce per-platform PPAT configurations2f2e968797b5 drm/i915: Introduce private PAT management1acf373125f5 drm/i915: Factor out setup_private_pat()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5472/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC v3 1/3 drm/i915: Factor out setup_private_pat()
In reply to Zhi WangFactor 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
@@ -2841,6 +2841,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;
@@ -2873,14 +2883,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;
@@ -2901,6 +2903,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
RFC v3 2/3 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_set.
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(), 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.
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_gem_gtt.c | 116 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_gem_gtt.h | 35 +++++++++++ 3 files changed, 153 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2307,6 +2307,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 +116 -0
134 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_gtt.h +35 -0
@@ -536,6 +536,41 @@ 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_count; +u8 value; +}; + +struct intel_ppat { +struct intel_ppat_entry entries[INTEL_MAX_PPAT_ENTRIES ]; + DECLARE_BITMAP(used, INTEL_MAX_PPAT_ENTRIES); + +unsigned int max_entries; + +u8 dummy_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); +/* +* Write the PPAT configuration into HW. +*/ +void (*update)(struct drm_i915_private *dev_priv); + +struct drm_i915_private *dev_priv; +}; + +struct intel_ppat_entry *intel_ppat_get (struct drm_i915_private *i915, +u8 value); +void intel_ppat_put (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
RFC v3 3/3 drm/i915: Introduce per-platform PPAT configurations
In reply to Zhi WangThe previous static PPAT configuration for each platform is kept unchanged. Also the PPAT feature of each platform is described in intel PPAT instance during the initialization and related callbacks which supports the PPAT management framework will be hooked.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 145 ++++++++++++++++++++++++------------ 1 file changed, 96 insertions(+), 49 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +96 -49
@@ -2844,41 +2844,92 @@ void intel_ppat_put(struct intel_ppat_entry *entry)kref_put (&entry->ref_count, put_ppat); } -static void cnl_setup_private_ppat (struct drm_i915_private *dev_priv) +static void cnl_private_pat_update (struct drm_i915_private *dev_priv) { +struct intel_ppat *ppat = &dev_priv->ppat; +int i; + +for (i =0 ; i < ppat->max_entries; i++) +I915_WRITE (GEN10_PAT_INDEX (i), ppat->entries[i].value); +} + +static void bdw_private_pat_update (struct drm_i915_private *dev_priv) +{ +struct intel_ppat *ppat = &dev_priv->ppat; +u64 pat =0 ; +int i; + +for (i =0 ; i < ppat->max_entries; i++) + pat |=GEN8_PPAT (i, ppat->entries[i].value); + +I915_WRITE (GEN8_PRIVATE_PAT_LO , pat); +I915_WRITE (GEN8_PRIVATE_PAT_HI , pat >>32 ); +} + +#define gen8_pat_ca (v) ((v) & 0x3) +#define gen8_pat_tc (v) (((v) >> 2) & 0x3) +#define gen8_pat_age (v) (((v) >> 4) & 0x3) + +static unsigned int bdw_private_pat_match (u8 src,u8 dst) +{ +unsigned int score =0 ; + +/* Cache attribute has to be matched. */ +if (gen8_pat_ca (src) !=gen8_pat_ca (dst)) +return 0 ; + +if (gen8_pat_age (src) ==gen8_pat_age (dst)) + score +=1 ; + +if (gen8_pat_tc (src) ==gen8_pat_tc (dst)) + score +=2 ; + +if (score ==3 ) +return INTEL_PPAT_PERFECT_MATCH ; + +return score; +} + +#define chv_get_snoop (v) (((v) >> 6) & 0x1) + +static unsigned int chv_private_pat_match (u8 src,u8 dst) +{ +if (chv_get_snoop (src) ==chv_get_snoop (dst)) +return ~0 ; + +return 0 ; +} + +static void cnl_setup_private_ppat (struct intel_ppat *ppat) +{ + ppat->max_entries =8 ; + ppat->update = cnl_private_pat_update; + ppat->match = bdw_private_pat_match; + ppat->dummy_value =GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 ); +/* XXX: spec is unclear if this is still needed for CNL+ */ if (!USES_PPGTT (dev_priv)) { -I915_WRITE (GEN10_PAT_INDEX (0 ),GEN8_PPAT_UC ); +alloc_ppat_entry (ppat,0 ,GEN8_PPAT_UC );return ; } -I915_WRITE (GEN10_PAT_INDEX (0 ),GEN8_PPAT_WB |GEN8_PPAT_LLC ); -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 )); +alloc_ppat_entry (ppat,0 ,GEN8_PPAT_WB |GEN8_PPAT_LLC ); +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_LLCELLC |GEN8_PPAT_AGE (0 )); }/* The GGTT and PPGTT need a private PPAT setup in order to handle cacheability * bits. When using advanced contexts each context stores its own PAT, but * writing this data shouldn't be harmful even in those cases. */ -static void bdw_setup_private_ppat (struct drm_i915_private *dev_priv) +static void bdw_setup_private_ppat (struct intel_ppat *ppat) { -u64 pat; + ppat->max_entries =8 ; + ppat->update = bdw_private_pat_update; + ppat->match = bdw_private_pat_match; + ppat->dummy_value =GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 ); - 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)) +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".
@@ -2892,17 +2943,22 @@ static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv)* So we can still hold onto all our assumptions wrt cpu * clflushing on LLC machines. */ - pat =GEN8_PPAT (0 ,GEN8_PPAT_UC ); +alloc_ppat_entry (ppat,0 ,GEN8_PPAT_UC ); +return ; + } -/* XXX: spec defines this as 2 distinct registers. It's unclear if a 64b -* write would work. */ -I915_WRITE (GEN8_PRIVATE_PAT_LO , pat); -I915_WRITE (GEN8_PRIVATE_PAT_HI , pat >>32 ); +alloc_ppat_entry (ppat,0 ,GEN8_PPAT_WB |GEN8_PPAT_LLC );/* for normal objects, no eLLC */ +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 )); } -static void chv_setup_private_ppat (struct drm_i915_private *dev_priv) +static void chv_setup_private_ppat (struct intel_ppat *ppat) { -u64 pat; + ppat->max_entries =8 ; + ppat->update = bdw_private_pat_update; + ppat->match = chv_private_pat_match; + ppat->dummy_value =CHV_PPAT_SNOOP ;/* * Map WB on BDW to snooped on CHV.
@@ -2922,17 +2978,11 @@ static void chv_setup_private_ppat(struct drm_i915_private *dev_priv)* Which means we must set the snoop bit in PAT entry 0 * in order to keep the global status page working. */ - pat =GEN8_PPAT (0 ,CHV_PPAT_SNOOP ) | -GEN8_PPAT (1 ,0 ) | -GEN8_PPAT (2 ,0 ) | -GEN8_PPAT (3 ,0 ) | -GEN8_PPAT (4 ,CHV_PPAT_SNOOP ) | -GEN8_PPAT (5 ,CHV_PPAT_SNOOP ) | -GEN8_PPAT (6 ,CHV_PPAT_SNOOP ) | -GEN8_PPAT (7 ,CHV_PPAT_SNOOP ); -I915_WRITE (GEN8_PRIVATE_PAT_LO , pat); -I915_WRITE (GEN8_PRIVATE_PAT_HI , pat >>32 ); +alloc_ppat_entry (ppat,0 ,CHV_PPAT_SNOOP ); +alloc_ppat_entry (ppat,2 ,0 ); +alloc_ppat_entry (ppat,3 ,0 ); +alloc_ppat_entry (ppat,4 ,CHV_PPAT_SNOOP ); }static void gen6_gmch_remove (struct i915_address_space *vm)
@@ -2950,20 +3000,23 @@ static void setup_private_pat(struct drm_i915_private *dev_priv) ppat->dev_priv = dev_priv; +/* Load per-platform PPAT configurations */ if (INTEL_GEN (dev_priv) >=10 ) -cnl_setup_private_ppat (dev_priv); +cnl_setup_private_ppat (ppat);else if (IS_CHERRYVIEW (dev_priv) ||IS_GEN9_LP (dev_priv)) -chv_setup_private_ppat (dev_priv); +chv_setup_private_ppat (ppat);else -bdw_setup_private_ppat (dev_priv); +bdw_setup_private_ppat (ppat);GEM_BUG_ON (ppat->max_entries >INTEL_MAX_PPAT_ENTRIES ); +/* Fill unused PPAT entries with dummy PPAT value */ for_each_clear_bit (i, ppat->used, ppat->max_entries) { ppat->entries[i].value = ppat->dummy_value; ppat->entries[i].ppat = ppat; } +/* Write the HW */ ppat->update (dev_priv); }
@@ -3278,13 +3331,7 @@ void i915_gem_restore_gtt_mappings(struct drm_i915_private *dev_priv) ggtt->base.closed = false;if (INTEL_GEN (dev_priv) >=8 ) { -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); - + dev_priv->ppat.update (dev_priv);return ; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx