drm/i915: Factor out setup_private_pat()
PATCH v13 1/5 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 v13 2/5 drm/i915: Introduce private PAT management
The 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 a new entry if there is any available PPAT indexs, or return a partially matched PPAT entry if there is no available PPAT indexes.
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.
v12:
- Fix a problem "not returning the entry of best score". (Zhenyu)
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
@@ -2347,6 +2347,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
Re: [PATCH v13 2/5] drm/i915: Introduce private PAT management
Quoted 14 lines · Zhi Wang
The private PAT management is to support PPAT entry manipulation. Two APIs are introduced for dynamically managing PPAT entries:
intel_ppat_getandintel_ppat_put.
intel_ppat_getwill search for an existing PPAT entry which perfectly matches the required PPAT value. If not, it will try to allocate a new entry if there is any available PPAT indexs, or return a partially matched PPAT entry if there is no available PPAT indexes.
intel_ppat_putwill put back the PPAT entry which comes fromintel_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.
Quoted 8 lines
Besides, another two callbacks are introduced to support the private PAT management framework. One is
ppat->update_hw(), which writes the PPAT configurations inppat->entriesinto HW. Another one isppat->match, which will return a score to show how two PPAT values match with each other.v12:
- Fix a problem "not returning the entry of best score". (Zhenyu)
This change should have resulted in adding an indication that Chris reviewed only a previous version of the patch.
Quoted 33 lines
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.htmlv5:
- 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 constintel_ppat_entry*. (Chris)v2:
- API re-design. (Chris)
Reviewed-by Chris Wilson <[email protected]>Cc Ben Widawsky <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Zhi Wang <[email protected]>
<SNIP>
Quoted 13 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +13
-0+/** +* intel_ppat_get - get a usable PPAT entry +* @i915: i915 device instance +* @value: the PPAT value required by the caller +* +* The function tries to search if there is an existing PPAT entry which +* matches with the required value. If perfectly matched, the existing PPAT +* entry will be used. If only partially matched, it will try to check if +* there is any available PPAT index. If yes, it will allocate a new PPAT +* index for the required entry and update the HW. If not, the partially +* matched entry will be used. +*/ +const struct intel_ppat_entry *
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2871
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +10
-0+intel_ppat_get(struct drm_i915_private *i915, u8 value) +{ +struct intel_ppat *ppat = &i915->ppat; +struct intel_ppat_entry *entry; +unsigned int scanned, best_score; +int i; + +GEM_BUG_ON (!ppat->max_entries); + + scanned = best_score =0 ;
You can drop this extra newline.
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2877
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +5
-0+for_each_set_bit (i, ppat->used, ppat->max_entries) { +unsigned int score; + + score = ppat->match (ppat->entries[i].value, value); +if (score > best_score) {
If you set "entry = &ppat->entries[i];" here already.
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2880
Quoted 3 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +3
-0+if (score ==INTEL_PPAT_PERFECT_MATCH ) { +kref_get (&ppat->entries[i].ref); +return &ppat->entries[i];
These become "kref_get(&entry->ref);" and "return entry;"
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2962
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +7
-0+static unsigned int bdw_private_pat_match (u8 src,u8 dst) +{ +unsigned int score =0 ; + +/* Cache attribute has to be matched. */ +if (GEN8_PPAT_GET_CA (src) !=GEN8_PPAT_GET_CA (dst)) +return 0 ;
We're not giving any points for when only cache attribute matches? Does not this result in ENOSPC when we would have an entry with matching "cache attribute", but no other matching entries while PPAT is full.
so maybe score += 4 here?
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2970
Quoted 8 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +8
-0+ +if (GEN8_PPAT_GET_TC (src) ==GEN8_PPAT_GET_TC (dst)) + score +=2 ; + +if (GEN8_PPAT_GET_AGE (src) ==GEN8_PPAT_GET_AGE (dst)) + score +=1 ; + +if (score ==3 )
(score == 7) respectively.
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2979
Quoted 9 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +9
-0+return INTEL_PPAT_PERFECT_MATCH ; + +return score; +} + +static unsigned int chv_private_pat_match (u8 src,u8 dst) +{ +return (CHV_PPAT_GET_SNOOP (src) ==CHV_PPAT_GET_SNOOP (dst)) ? +INTEL_PPAT_PERFECT_MATCH :0 ;
This handles the situation correctly, when snooping is the only attribute looked for.
With the BDW attribute fix scoring, this is;
Remember to add to the end of the tag list ;)
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v13 2/5] drm/i915: Introduce private PAT management
Quoted 108 lines · Joonas Lahtinen
Quoted 14 lines · Zhi Wang
The private PAT management is to support PPAT entry manipulation. Two APIs are introduced for dynamically managing PPAT entries:
intel_ppat_getandintel_ppat_put.
intel_ppat_getwill search for an existing PPAT entry which perfectly matches the required PPAT value. If not, it will try to allocate a new entry if there is any available PPAT indexs, or return a partially matched PPAT entry if there is no available PPAT indexes.
intel_ppat_putwill put back the PPAT entry which comes fromintel_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.Quoted 8 lines
Besides, another two callbacks are introduced to support the private PAT management framework. One is
ppat->update_hw(), which writes the PPAT configurations inppat->entriesinto HW. Another one isppat->match, which will return a score to show how two PPAT values match with each other.v12:
- Fix a problem "not returning the entry of best score". (Zhenyu)
This change should have resulted in adding an indication that Chris reviewed only a previous version of the patch.
Quoted 32 lines
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.htmlv5:
- 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 constintel_ppat_entry*. (Chris)v2:
- API re-design. (Chris)
Reviewed-by Chris Wilson <[email protected]>Cc Ben Widawsky <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Zhi Wang <[email protected]><SNIP>
Quoted 13 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +13
-0+/** +* intel_ppat_get - get a usable PPAT entry +* @i915: i915 device instance +* @value: the PPAT value required by the caller +* +* The function tries to search if there is an existing PPAT entry which +* matches with the required value. If perfectly matched, the existing PPAT +* entry will be used. If only partially matched, it will try to check if +* there is any available PPAT index. If yes, it will allocate a new PPAT +* index for the required entry and update the HW. If not, the partially +* matched entry will be used. +*/ +const struct intel_ppat_entry *drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2871
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +10
-0+intel_ppat_get(struct drm_i915_private *i915, u8 value) +{ +struct intel_ppat *ppat = &i915->ppat; +struct intel_ppat_entry *entry; +unsigned int scanned, best_score; +int i; + +GEM_BUG_ON (!ppat->max_entries); + + scanned = best_score =0 ;You can drop this extra newline.
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2877
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +5
-0+for_each_set_bit (i, ppat->used, ppat->max_entries) { +unsigned int score; + + score = ppat->match (ppat->entries[i].value, value); +if (score > best_score) {If you set "entry = &ppat->entries[i];" here already.
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2880
Quoted 3 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +3
-0+if (score ==INTEL_PPAT_PERFECT_MATCH ) { +kref_get (&ppat->entries[i].ref); +return &ppat->entries[i];These become "
kref_get(&entry->ref);" and "return entry;"drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2962
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +7
-0+static unsigned int bdw_private_pat_match (u8 src,u8 dst) +{ +unsigned int score =0 ; + +/* Cache attribute has to be matched. */ +if (GEN8_PPAT_GET_CA (src) !=GEN8_PPAT_GET_CA (dst)) +return 0 ;We're not giving any points for when only cache attribute matches? Does not this result in ENOSPC when we would have an entry with matching "cache attribute", but no other matching entries while PPAT is full.
Quoted 2 lines
so maybe score += 4 here?
Aiha. cache attribute of src == cache attribute of dst is mandatory since the mismatch of other attribute only causes performance drop, but mismatch of cache attribute causes problem of correctness.
Quoted 22 lines
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2970
Quoted 8 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +8
-0+ +if (GEN8_PPAT_GET_TC (src) ==GEN8_PPAT_GET_TC (dst)) + score +=2 ; + +if (GEN8_PPAT_GET_AGE (src) ==GEN8_PPAT_GET_AGE (dst)) + score +=1 ; + +if (score ==3 )(score == 7) respectively.drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2979
Quoted 9 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +9
-0+return INTEL_PPAT_PERFECT_MATCH ; + +return score; +} + +static unsigned int chv_private_pat_match (u8 src,u8 dst) +{ +return (CHV_PPAT_GET_SNOOP (src) ==CHV_PPAT_GET_SNOOP (dst)) ? +INTEL_PPAT_PERFECT_MATCH :0 ;This handles the situation correctly, when snooping is the only attribute looked for.
Quoted 7 lines
With the BDW attribute fix scoring, this is;
Reviewed-by Joonas Lahtinen <[email protected]>Remember to add to the end of the tag list ;)
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH v13 2/5] drm/i915: Introduce private PAT management
Quoted 3 lines · Zhi Wang
Quoted 2 lines · Joonas Lahtinen
Quoted 1 line · Zhi Wang
The private PAT management is to support PPAT entry manipulation. Two
<SNIP>
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2962
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +7
-0+static unsigned int bdw_private_pat_match (u8 src,u8 dst) +{ +unsigned int score =0 ; + +/* Cache attribute has to be matched. */ +if (GEN8_PPAT_GET_CA (src) !=GEN8_PPAT_GET_CA (dst)) +return 0 ;We're not giving any points for when only cache attribute matches? Does not this result in ENOSPC when we would have an entry with matching "cache attribute", but no other matching entries while PPAT is full.
Quoted 6 lines
Quoted 2 lines
so maybe score += 4 here?Aiha. cache attribute of src == cache attribute of dst is mandatory since the mismatch of other attribute only causes performance drop, but mismatch of cache attribute causes problem of correctness.
Yes, that's why I suggested;
if (CA(src) != CA(dst))
return 0;
score += 4;
if (...)
score += ...
Because currently, if only the cache attribute matches (which is enough for correctness), the score is returned as zero which is then rejected just like if cache attribute did not match. If only cache attribute matches, we should return non-zero, like my example above.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v13 2/5] drm/i915: Introduce private PAT management
Thanks! :) I see.
-----Original Message-----
From: Joonas Lahtinen [mailto:[email protected]]
Sent: Tuesday, September 12, 2017 4:34 PM
To: Wang, Zhi A <[email protected]>; [email protected]; [email protected]
Cc: Vivi, Rodrigo <[email protected]>; Widawsky, Benjamin <[email protected]>; [email protected]; [email protected]
Subject: Re: [PATCH v13 2/5] drm/i915: Introduce private PAT management
Quoted 4 lines · Zhi Wang
Quoted 3 lines · Joonas Lahtinen
Quoted 2 lines · Zhi Wang
The private PAT management is to support PPAT entry manipulation. Two
<SNIP>
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) · line 2962
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +6
-0+static unsigned int bdw_private_pat_match (u8 src,u8 dst) { +unsigned int score =0 ; + +/* Cache attribute has to be matched. */ +if (GEN8_PPAT_GET_CA (src) !=GEN8_PPAT_GET_CA (dst)) +return 0 ;We're not giving any points for when only cache attribute matches? Does not this result in ENOSPC when we would have an entry with matching "cache attribute", but no other matching entries while PPAT is full.
Quoted 6 lines
Quoted 2 lines
so maybe score += 4 here?Aiha. cache attribute of src == cache attribute of dst is mandatory since the mismatch of other attribute only causes performance drop, but mismatch of cache attribute causes problem of correctness.
Yes, that's why I suggested;
if (CA(src) != CA(dst))
return 0;
score += 4;
if (...)
score += ...
Because currently, if only the cache attribute matches (which is enough for correctness), the score is returned as zero which is then rejected just like if cache attribute did not match. If only cache attribute matches, we should return non-zero, like my example above.
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v13 3/5 drm/i915: Remove the "INDEX" suffix from PPAT marcos
In reply to Zhi WangRemove the "INDEX" suffix from PPAT marcos as they are bits actually, not indexes.
--- drivers/gpu/drm/i915/gvt/gtt.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 10 +++++----- drivers/gpu/drm/i915/i915_gem_gtt.h | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/gvt/gtt.c +1 -1
@@ -1971,7 +1971,7 @@ static int alloc_scratch_pages(struct intel_vgpu *vgpu,*/ se.val64 |= _PAGE_PRESENT | _PAGE_RW;if (type ==GTT_TYPE_PPGTT_PDE_PT ) - se.val64 |=PPAT_CACHED_INDEX ; + se.val64 |=PPAT_CACHED ;for (i =0 ; i < page_entry_num; i++) ops->set_entry (scratch_pt, &se, i, false,0 , vgpu);
drivers/gpu/drm/i915/i915_gem_gtt.c +5 -5
@@ -230,13 +230,13 @@ static gen8_pte_t gen8_pte_encode(dma_addr_t addr,switch (level) {case I915_CACHE_NONE : - pte |=PPAT_UNCACHED_INDEX ; + pte |=PPAT_UNCACHED ;break ;case I915_CACHE_WT : - pte |=PPAT_DISPLAY_ELLC_INDEX ; + pte |=PPAT_DISPLAY_ELLC ;break ;default : - pte |=PPAT_CACHED_INDEX ; + pte |=PPAT_CACHED ;break ; }
@@ -249,9 +249,9 @@ static gen8_pde_t gen8_pde_encode(const dma_addr_t addr,gen8_pde_t pde = _PAGE_PRESENT | _PAGE_RW; pde |= addr;if (level !=I915_CACHE_NONE ) - pde |=PPAT_CACHED_PDE_INDEX ; + pde |=PPAT_CACHED_PDE ;else - pde |=PPAT_UNCACHED_INDEX ; + pde |=PPAT_UNCACHED ;return pde; }
drivers/gpu/drm/i915/i915_gem_gtt.h +4 -4
@@ -126,10 +126,10 @@ typedef u64 gen8_ppgtt_pml4e_t;* tables */ #define GEN8_PDPE_MASK 0x1ff -#define PPAT_UNCACHED_INDEX (_PAGE_PWT | _PAGE_PCD) -#define PPAT_CACHED_PDE_INDEX 0/* WB LLC */ -#define PPAT_CACHED_INDEX _PAGE_PAT/* WB LLCeLLC */ -#define PPAT_DISPLAY_ELLC_INDEX _PAGE_PCD/* WT eLLC */ +#define PPAT_UNCACHED (_PAGE_PWT | _PAGE_PCD) +#define PPAT_CACHED_PDE 0/* WB LLC */ +#define PPAT_CACHED _PAGE_PAT/* WB LLCeLLC */ +#define PPAT_DISPLAY_ELLC _PAGE_PCD/* WT eLLC */ #define CHV_PPAT_SNOOP (1<<6)#define GEN8_PPAT_AGE (x) (x<<4)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v13 4/5 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.
v8:
- Move ppat_index() into i915_gem_gtt.c. (Chris)
- Change the name of ppat_bits_to_index to ppat_index.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 53 +++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +27 -26
@@ -2979,6 +2979,13 @@ static unsigned int chv_private_pat_match(u8 src, u8 dst) INTEL_PPAT_PERFECT_MATCH :0 ; } +/* PPAT index = 4 * PAT + 2 * PCD + PWT */ +static inline unsigned int ppat_index (unsigned int bits) +{ +return (4 * !!(bits & _PAGE_PAT) +2 * !!(bits & _PAGE_PCD) + + !!(bits & _PAGE_PWT)); +} +static void cnl_setup_private_ppat (struct intel_ppat *ppat) { ppat->max_entries =8 ;
@@ -2988,18 +2995,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_index (PPAT_CACHED_PDE ),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_index (PPAT_CACHED_PDE ),GEN8_PPAT_WB |GEN8_PPAT_LLC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_DISPLAY_ELLC ),GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_UNCACHED ),GEN8_PPAT_UC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED ),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 +3030,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_index (PPAT_CACHED_PDE ),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_index (PPAT_CACHED_PDE ),GEN8_PPAT_WB |GEN8_PPAT_LLC ); +/* for scanout with eLLC */ +__alloc_ppat_entry (ppat,ppat_index (PPAT_DISPLAY_ELLC ),GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ); +/* Uncached objects, mostly for scanout */ +__alloc_ppat_entry (ppat,ppat_index (PPAT_UNCACHED ),GEN8_PPAT_UC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); }static void chv_setup_private_ppat (struct intel_ppat *ppat)
@@ -3066,14 +3070,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_index (PPAT_CACHED_PDE ),CHV_PPAT_SNOOP ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_DISPLAY_ELLC ),0 ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_UNCACHED ),0 ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED ),CHV_PPAT_SNOOP ); }static void gen6_gmch_remove (struct i915_address_space *vm)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v13 4/5] drm/i915: Do not allocate unused PPAT entries
Quoted 13 lines · Zhi Wang
Only PPAT entries 0/2/3/4 are using. Remove extra PPAT entry allocation during initialization.
v8:
- Move
ppat_index()intoi915_gem_gtt.c. (Chris)
- Change the name ofppat_bits_to_indextoppat_index.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]>
<SNIP>
Quoted 9 lines
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 53 +++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 26 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0
drivers/gpu/drm/i915/i915_gem_gtt.c static unsigned int chv_private_pat_match(u8 src, u8 dst) · line 2986
Quoted 8 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +5
-0@@ -2979,6 +2979,13 @@ static unsigned int chv_private_pat_match(u8 src, u8 dst) INTEL_PPAT_PERFECT_MATCH :0 ; } +/* PPAT index = 4 * PAT + 2 * PCD + PWT */ +static inline unsigned int ppat_index (unsigned int bits) +{ +return (4 * !!(bits & _PAGE_PAT) +2 * !!(bits & _PAGE_PCD) + + !!(bits & _PAGE_PWT));
Would this be more readable as
return 4 * !!(bits & _PAGE_PAT) + 2 * !!(bits & _PAGE_PCD) + 1 * !!(bits & _PAGE_PWT);
Quoted 9 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1/* The GGTT and PPGTT need a private PPAT setup in order to handle cacheability @@ -3026,18 +3030,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_index (PPAT_CACHED_PDE ),GEN8_PPAT_UC );return ; }
drivers/gpu/drm/i915/i915_gem_gtt.c static void bdw_setup_private_ppat(struct intel_ppat *ppat) · line 3037
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-8-__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 */
Maybe lift these three comments below to the gen8_pte_encode? The usages are driver wide, really.
Anyway, this is;
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v13 5/5 drm/i915/selftests: Introduce live tests of private PAT management
In reply to Zhi WangIntroduce two live tests of private PAT management:
igt_ppat_init - This test is to check if all the PPAT configurations are written into HW.
igt_ppat_get - This test performs several sub-tests on intel_ppat_get() and intel_ppat_put().
The "perfect match" test case will try to get a PPAT entry with an existing value, then check if the returned PPAT entry is the same one.
The "alloc entries" test case will run out of PPAT table, and check if all the requested values are put into the newly allocated PPAT entries.
The negative test case will try to generate a new PPAT value, and get it when PPAT table is full.
The "partial match" test case will generate a parital matched value from the existing PPAT table and try to match it.
The "re-alloc" test case will try to free and then allocate a new entry when the PPAT table is full.
The "put entries" test case will free all the PPAT entries that allocated in "alloc entries" test case. It will check if the values of freed PPAT entries turn into ppat->clear_value.
v11:
- Fix one indent problem in v10.
v10:
- Refine code structure.
- Introduce "re-alloc" test case. (Chris)
v9:
- Refine generate_new_value(). (Chris)
- Refine failure output. (Chris)
- Refine test flow of "perfect match". (Chris)
- Introduce another negative test case after "partial match". (Chris)
v8:
- Remove noisy output. (Chris)
- Add negative test case. (Chris)
--- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 378 ++++++++++++++++++++++++++ 1 file changed, 378 insertions(+)
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +378 -0
@@ -1094,6 +1094,382 @@ static int igt_ggtt_page(void *arg)return err; } +static int check_cnl_ppat (struct drm_i915_private *dev_priv) +{ +struct intel_ppat *ppat = &dev_priv->ppat; +int i; + +for (i =0 ; i < ppat->max_entries; i++) { +u32 value =I915_READ (GEN10_PAT_INDEX (i)); + +if (value != ppat->entries[i].value) { +pr_err ("check PPAT failed: expected %x found %x\n" , + ppat->entries[i].value, value); +return -EINVAL ; + } + } +return 0 ; +} + +static int check_bdw_ppat (struct drm_i915_private *dev_priv) +{ +struct intel_ppat *ppat = &dev_priv->ppat; +u64 pat, hw_pat; +int i; + + pat = hw_pat =0 ; + +for (i =0 ; i < ppat->max_entries; i++) + pat |=GEN8_PPAT (i, ppat->entries[i].value); + + hw_pat =I915_READ (GEN8_PRIVATE_PAT_HI ); + hw_pat <<=32 ; + hw_pat |=I915_READ (GEN8_PRIVATE_PAT_LO ); + +if (pat != hw_pat) { +pr_err ("check PPAT failed: expected %llx found %llx\n" , + pat, hw_pat); +return -EINVAL ; + } +return 0 ; +} + +static int igt_ppat_check (void *arg) +{ +struct drm_i915_private *i915 = arg; +int ret; + +if (!i915->ppat.max_entries) +return 0 ; + +if (INTEL_GEN (i915) >=10 ) + ret =check_cnl_ppat (i915); +else + ret =check_bdw_ppat (i915); + +if (ret) +pr_err ("check PPAT failed\n" ); + +return ret; +} + +static bool value_is_new (struct intel_ppat *ppat,u8 value) +{ +int i; + +for_each_set_bit (i, ppat->used, ppat->max_entries) { +if (value != ppat->entries[i].value) +continue ; + +return false; + } +return true; +} + +static bool value_for_partial_test (struct intel_ppat *ppat,u8 value) +{ +int i; + +if (!value_is_new (ppat, value)) +return false; + +/* +* At least, there should be one entry whose cache attribute is +* same with the required value. +*/ +for_each_set_bit (i, ppat->used, ppat->max_entries) { +if (GEN8_PPAT_GET_CA (value) != +GEN8_PPAT_GET_CA (ppat->entries[i].value)) +continue ; + +return true; + } +return false; +} + +static bool value_for_negative_test (struct intel_ppat *ppat,u8 value) +{ +int i; + +if (!value_is_new (ppat, value)) +return false; + +/* +* cache attribute has to be different, so i915_ppat_get() would +* allocate a new entry. +*/ +for_each_set_bit (i, ppat->used, ppat->max_entries) { +if (GEN8_PPAT_GET_CA (value) == +GEN8_PPAT_GET_CA (ppat->entries[i].value)) +return false; + } +return true; +} + +static u8 generate_new_value (struct intel_ppat *ppat, +bool (*check_value)(struct intel_ppat *,u8 )) +{ +u8 ca[] = {GEN8_PPAT_WB ,GEN8_PPAT_WT ,GEN8_PPAT_UC ,GEN8_PPAT_WC }; +u8 tc[] = {GEN8_PPAT_LLC ,GEN8_PPAT_LLCELLC , GEN8_PPAT_LLCeLLC }; +u8 age[] = {GEN8_PPAT_AGE (3 ),GEN8_PPAT_AGE (2 ),GEN8_PPAT_AGE (1 ), +GEN8_PPAT_AGE (0 ) }; +int ca_index, tc_index, age_index; +u8 value; + +#define for_each_ppat_attr (ca_index, tc_index, age_index) \ + for ((ca_index) = 0 ; (ca_index) < ARRAY_SIZE(ca); (ca_index)++) \ + for ((tc_index) = 0; (tc_index) < ARRAY_SIZE(tc); (tc_index)++) \ + for ((age_index) = 0; (age_index) < ARRAY_SIZE(age); (age_index)++) + +for_each_ppat_attr (ca_index, tc_index, age_index) { + value = age[age_index] | ca[ca_index] | tc[tc_index]; +if (check_value (ppat, value)) +return value; + } +#undef for_each_ppat_attr +return 0 ; +} + +static const struct intel_ppat_entry * +generate_and_check_new_value (struct intel_ppat *ppat) +{ +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +u8 value; +DECLARE_BITMAP (used,INTEL_MAX_PPAT_ENTRIES ); + + value =generate_new_value (ppat, value_is_new); +if (!value) { +pr_err ("fail to generate new value\n" ); +return ERR_PTR (-EINVAL ); + } + +bitmap_copy (used, ppat->used, ppat->max_entries); + + entry =intel_ppat_get (i915, value); +if (IS_ERR (entry)) { +pr_err ("fail to get new entry\n" ); +return ERR_PTR (-EINVAL ); + } + +if (entry->value != value) { +pr_err ("value is not expected, expected %x found %x\n" , + value, entry->value); + goto err; + } + +if (bitmap_equal (used, ppat->used, ppat->max_entries)) { +pr_err ("fail to alloc a new entry\n" ); + goto err; + } + +return entry; +err: +intel_ppat_put (entry); +return ERR_PTR (-EINVAL ); +} + +static int put_and_check_entry (const struct intel_ppat_entry *entry) +{ +intel_ppat_put (entry); + +if (entry->value != entry->ppat->clear_value) { +pr_err ("fail to put ppat value\n" ); +return -EINVAL ; + } +return 0 ; +} + +static int perform_perfect_match_test (struct intel_ppat *ppat) +{ +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +int ret, i; + +for_each_set_bit (i, ppat->used, ppat->max_entries) { + entry =intel_ppat_get (i915, ppat->entries[i].value); +if (IS_ERR (entry)) +return PTR_ERR (entry); + +if (entry != &ppat->entries[i]) { +pr_err ("entry is not expected\n" ); +intel_ppat_put (entry); +return -EINVAL ; + } + ret =put_and_check_entry (entry); +if (ret) +return ret; + } +return 0 ; +} + +static int perform_negative_test (struct intel_ppat *ppat) +{ +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +u8 value; + + value =generate_new_value (ppat, value_for_negative_test); +if (!value) { +pr_err ("fail to generate new value for negative test 2\n" ); +return -EINVAL ; + } + + entry =intel_ppat_get (i915, value); +if (!IS_ERR (entry) ||PTR_ERR (entry) != -ENOSPC ) { +pr_err ("fail on negative test\n" ); +return -EINVAL ; + } +return 0 ; +} + +static int perform_partial_match_test (struct intel_ppat *ppat) +{ +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +u8 value; +int ret; + + value =generate_new_value (ppat, value_for_partial_test); +if (!value) { +pr_err ("fail to generate new value for partial test\n" ); +return -EINVAL ; + } + + entry =intel_ppat_get (i915, value); +if (IS_ERR (entry)) { +pr_err ("fail to get new entry\n" ); +return PTR_ERR (entry); + } + +if (!(entry->value != value && +GEN8_PPAT_GET_CA (entry->value) ==GEN8_PPAT_GET_CA (value))) { +pr_err ("value is not expected, expected %x found %x\n" , + value, entry->value); +intel_ppat_put (entry); +return -EINVAL ; + } + + ret =put_and_check_entry (entry); +if (ret) +return ret; + +return 0 ; +} + +static int igt_ppat_get (void *arg) +{ +struct drm_i915_private *i915 = arg; +struct intel_ppat *ppat = &i915->ppat; +const struct intel_ppat_entry **entries, **p; +const struct intel_ppat_entry *entry; +unsigned int size =0 ; +int i, ret; + +if (!ppat->max_entries) +return 0 ; + + ret =igt_ppat_check (i915); +if (ret) +return ret; + +/* case 1: perfect match */ + ret =perform_perfect_match_test (ppat); +if (ret) { +pr_err ("fail on perfect match test\n" ); +return ret; + } + +/* case 2: alloc new entries */ + entries =NULL ; + ret =0 ; + +while (!bitmap_full (ppat->used, ppat->max_entries)) { + p =krealloc (entries, (size +1 ) * +sizeof (struct intel_ppat_entry *), +GFP_KERNEL ); +if (!p) { + ret = -ENOMEM ; + goto ppat_put; + } + + entries = p; + + p = &entries[size++]; + *p =NULL ; + + entry =generate_and_check_new_value (ppat); +if (IS_ERR (entry)) { + ret =PTR_ERR (entry); +pr_err ("fail on alloc new entries test\n" ); + goto ppat_put; + } + *p = entry; + } + +/* case 3: negative test 1, suppose PPAT table is full now */ + ret =perform_negative_test (ppat); +if (ret) { +pr_err ("fail on negative test 1\n" ); + goto ppat_put; + } + +/* case 4: partial match */ + ret =perform_partial_match_test (ppat); +if (ret) { +pr_err ("fail on partial match test\n" ); + goto ppat_put; + } + +/* case 3: negative test 2, suppose PPAT table is still full now */ + ret =perform_negative_test (ppat); +if (ret) { +pr_err ("fail on negative test 2\n" ); + goto ppat_put; + } + +/* case 5: re-alloc test, make a hole and it should work again */ +if (entries) { +for (i =0 ; i < size; i++) { + entry = entries[i]; + + ret =put_and_check_entry (entry); + entries[i] =NULL ; +if (ret) { +pr_err ("fail on re-alloc test\n" ); + goto ppat_put; + } + + entry =generate_and_check_new_value (ppat); +if (IS_ERR (entry)) { + ret =PTR_ERR (entry); +pr_err ("fail on re-alloc test\n" ); + goto ppat_put; + } + entries[i] = entry; + } + } + +ppat_put: +if (entries) { +for (i =0 ; i < size; i++) { +if (IS_ERR (entries[i]) || !entries[i]) +continue ; + +if (ret) +intel_ppat_put (entry); +else + ret =put_and_check_entry (entries[i]); + } +kfree (entries); + entries =NULL ; + } +if (ret) +return ret; + +return igt_ppat_check (i915); +} +static void track_vma_bind (struct i915_vma *vma) {struct drm_i915_gem_object *obj = vma->obj;
@@ -1560,6 +1936,8 @@ int i915_gem_gtt_live_selftests(struct drm_i915_private *i915)SUBTEST (igt_ggtt_pot),SUBTEST (igt_ggtt_fill),SUBTEST (igt_ggtt_page), +SUBTEST (igt_ppat_check), +SUBTEST (igt_ppat_get), };GEM_BUG_ON (offset_in_page (i915->ggtt.base.total));
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: warning for series starting with [v13,1/5] drm/i915: Factor out setup_private_pat()
In reply to Zhi Wang== Series Details ==
== Series Details ==
Series: series starting with [v13,1/5] drm/i915: Factor out setup_private_pat()
URL : https://patchwork.freedesktop.org/series/30093/
State : warning
== Summary ==
Series 30093v1 series starting with [v13,1/5] drm/i915: Factor out setup_private_pat()
https://patchwork.freedesktop.org/api/1.0/series/30093/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
pass -> FAIL (fi-kbl-7500u) fdo#102514
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
pass -> FAIL (fi-snb-2600) fdo#100215
Test kms_flip:
Subgroup basic-flip-vs-modeset:
pass -> SKIP (fi-skl-x1585l) fdo#101781
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-kbl-7500u)fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#101781 https://bugs.freedesktop.org/show_bug.cgi?id=101781
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:445s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:455s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:381s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:526s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:269s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:509s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:501s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:500s fi-cfl-s total:289 pass:250 dwarn:4 dfail:0 fail:0 skip:35 time:452s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:445s fi-glk-2a total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:598s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:426s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:410s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:440s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:482s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:459s fi-kbl-7500u total:289 pass:262 dwarn:2 dfail:0 fail:1 skip:24 time:488s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:580s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:587s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:554s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:459s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:526s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:501s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:455s fi-skl-x1585l total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:477s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:568s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:1 skip:39 time:423s
9ef5732ddf6924e98a5c5d034a3535cff14f72bf drm-tip: 2017y-09m-10d-21h-59m-53s UTC integration manifest f6446a80c108 drm/i915: Introduce private PAT management7acce8558c8f drm/i915: Factor out setup_private_pat()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5630/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx