drm/i915/gtt: pde entry encoding is identical
Subsystems (2)
PATCH 1/4 drm/i915/gtt: pde entry encoding is identical
For all page directory entries, the pde encoding is identical. Don't compilicate call sites with different versions of doing the same thing. We check the existence of physical page before writing the entry into it. This further generalizes the pd so that manipulation in callsites will be identical, removing the need to handle pdps differently for gen8.
v2: squash
v3: inc/dec with set/clear (Chris)
v4: inlines, warn, stray set_pd (Chris)
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 152 ++++++++++++---------------- drivers/gpu/drm/i915/i915_gem_gtt.h | 3 - 2 files changed, 63 insertions(+), 92 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +63 -89
@@ -211,10 +211,10 @@ static u64 gen8_pte_encode(dma_addr_t addr,return pte; } -static gen8_pde_t gen8_pde_encode (const dma_addr_t addr, -const enum i915_cache_level level) +static u64 gen8_pde_encode (const dma_addr_t addr, +const enum i915_cache_level level) { -gen8_pde_t pde = _PAGE_PRESENT | _PAGE_RW; +u64 pde = _PAGE_PRESENT | _PAGE_RW; pde |= addr;if (level !=I915_CACHE_NONE ) pde |=PPAT_CACHED_PDE ;
@@ -223,9 +223,6 @@ static gen8_pde_t gen8_pde_encode(const dma_addr_t addr,return pde; } -#define gen8_pdpe_encode gen8_pde_encode -#define gen8_pml4e_encode gen8_pde_encode -static u64 snb_pte_encode (dma_addr_t addr,enum i915_cache_level level,u32 flags)
@@ -777,24 +774,55 @@ static void free_pd(struct i915_address_space *vm,kfree (pd); } -static void init_pd_with_page (struct i915_address_space *vm, -struct i915_page_directory *const pd, -struct i915_page_table *pt) +#define init_pd (vm, pd, to) { \ + GEM_DEBUG_BUG_ON(!pd_has_phys_page(pd)); \ + fill_px((vm), (pd), gen8_pde_encode(px_dma(to), I915_CACHE_LLC)); \ + memset_p((pd)->entry, (to), 512); \ +} + +static inline void +write_dma_entry (struct i915_page_dma *const pdma, +const unsigned short pde, +const u64 encoded_entry) +{ +u64 *const vaddr =kmap_atomic (pdma->page); + + vaddr[pde] = encoded_entry; +kunmap_atomic (vaddr); +} + +static inline void +__set_pd_entry (struct i915_page_directory *const pd, +const unsigned short pde, +struct i915_page_dma *const to, +u64 (*encode)(const dma_addr_t ,const enum i915_cache_level )) { -fill_px (vm, pd,gen8_pde_encode (px_dma (pt),I915_CACHE_LLC )); -memset_p (pd->entry, pt,512 ); +GEM_BUG_ON (atomic_read (&pd->used) >512 ); + +atomic_inc (&pd->used); + pd->entry[pde] = to; +write_dma_entry (px_base (pd), pde,encode (to->daddr,I915_CACHE_LLC )); } -static void init_pd (struct i915_address_space *vm, -struct i915_page_directory *const pd, -struct i915_page_directory *const to) +static inline void +__clear_pd_entry (struct i915_page_directory *const pd, +const unsigned short pde, +struct i915_page_dma *const to, +u64 (*encode)(const dma_addr_t ,const enum i915_cache_level )) { -GEM_DEBUG_BUG_ON (!pd_has_phys_page (pd)); +GEM_BUG_ON (atomic_read (&pd->used) ==0 ); -fill_px (vm, pd,gen8_pdpe_encode (px_dma (to),I915_CACHE_LLC )); -memset_p (pd->entry, to,512 ); +write_dma_entry (px_base (pd), pde,encode (to->daddr,I915_CACHE_LLC )); + pd->entry[pde] = to; +atomic_dec (&pd->used); } +#define set_pd_entry (pd, pde, to) \ + __set_pd_entry((pd), (pde), px_base(to), gen8_pde_encode) + +#define clear_pd_entry (pd, pde, to) \ + __clear_pd_entry((pd), (pde), px_base(to), gen8_pde_encode) +/* * PDE TLBs are a pain to invalidate on GEN8+. When we modify * the page table structures, we mark them dirty so that
@@ -824,18 +852,6 @@ static bool gen8_ppgtt_clear_pt(const struct i915_address_space *vm,return !atomic_sub_return (num_entries, &pt->used); } -static void gen8_ppgtt_set_pde (struct i915_address_space *vm, -struct i915_page_directory *pd, -struct i915_page_table *pt, -unsigned int pde) -{ -gen8_pde_t *vaddr; - - vaddr =kmap_atomic_px (pd); - vaddr[pde] =gen8_pde_encode (px_dma (pt),I915_CACHE_LLC ); -kunmap_atomic (vaddr); -} -static bool gen8_ppgtt_clear_pd (struct i915_address_space *vm,struct i915_page_directory *pd,u64 start,u64 length)
@@ -853,11 +869,7 @@ static bool gen8_ppgtt_clear_pd(struct i915_address_space *vm,spin_lock (&pd->lock);if (!atomic_read (&pt->used)) { -gen8_ppgtt_set_pde (vm, pd, vm->scratch_pt, pde); - pd->entry[pde] = vm->scratch_pt; - -GEM_BUG_ON (!atomic_read (&pd->used)); -atomic_dec (&pd->used); +clear_pd_entry (pd, pde, vm->scratch_pt); free = true; }spin_unlock (&pd->lock);
@@ -868,20 +880,6 @@ static bool gen8_ppgtt_clear_pd(struct i915_address_space *vm,return !atomic_read (&pd->used); } -static void gen8_ppgtt_set_pdpe (struct i915_page_directory *pdp, -struct i915_page_directory *pd, -unsigned int pdpe) -{ -gen8_ppgtt_pdpe_t *vaddr; - -if (!pd_has_phys_page (pdp)) -return ; - - vaddr =kmap_atomic_px (pdp); - vaddr[pdpe] =gen8_pdpe_encode (px_dma (pd),I915_CACHE_LLC ); -kunmap_atomic (vaddr); -} -/* Removes entries from a single page dir pointer, releasing it if it's empty. * Caller can use the return value to update higher-level entries */
@@ -902,11 +900,7 @@ static bool gen8_ppgtt_clear_pdp(struct i915_address_space *vm,spin_lock (&pdp->lock);if (!atomic_read (&pd->used)) { -gen8_ppgtt_set_pdpe (pdp, vm->scratch_pd, pdpe); - pdp->entry[pdpe] = vm->scratch_pd; - -GEM_BUG_ON (!atomic_read (&pdp->used)); -atomic_dec (&pdp->used); +clear_pd_entry (pdp, pdpe, vm->scratch_pd); free = true; }spin_unlock (&pdp->lock);
@@ -923,17 +917,6 @@ static void gen8_ppgtt_clear_3lvl(struct i915_address_space *vm,gen8_ppgtt_clear_pdp (vm,i915_vm_to_ppgtt (vm)->pd, start, length); } -static void gen8_ppgtt_set_pml4e (struct i915_page_directory *pml4, -struct i915_page_directory *pdp, -unsigned int pml4e) -{ -gen8_ppgtt_pml4e_t *vaddr; - - vaddr =kmap_atomic_px (pml4); - vaddr[pml4e] =gen8_pml4e_encode (px_dma (pdp),I915_CACHE_LLC ); -kunmap_atomic (vaddr); -} -/* Removes entries from a single pml4. * This is the top-level structure in 4-level page tables used on gen8+. * Empty entries are always scratch pml4e.
@@ -957,8 +940,7 @@ static void gen8_ppgtt_clear_4lvl(struct i915_address_space *vm,spin_lock (&pml4->lock);if (!atomic_read (&pdp->used)) { -gen8_ppgtt_set_pml4e (pml4, vm->scratch_pdp, pml4e); - pml4->entry[pml4e] = vm->scratch_pdp; +clear_pd_entry (pml4, pml4e, vm->scratch_pdp); free = true; }spin_unlock (&pml4->lock);
@@ -1275,7 +1257,7 @@ static int gen8_init_scratch(struct i915_address_space *vm) }gen8_initialize_pt (vm, vm->scratch_pt); -init_pd_with_page (vm, vm->scratch_pd, vm->scratch_pt); +init_pd (vm, vm->scratch_pd, vm->scratch_pt);if (i915_vm_is_4lvl (vm))init_pd (vm, vm->scratch_pdp, vm->scratch_pd);
@@ -1298,6 +1280,11 @@ static int gen8_ppgtt_notify_vgt(struct i915_ppgtt *ppgtt, bool create)enum vgt_g2v_type msg;int i; +if (create) +atomic_inc (&ppgtt->pd->used);/* never remove */ +else +atomic_dec (&ppgtt->pd->used); +if (i915_vm_is_4lvl (vm)) {const u64 daddr =px_dma (ppgtt->pd);
@@ -1414,9 +1401,7 @@ static int gen8_ppgtt_alloc_pd(struct i915_address_space *vm,spin_lock (&pd->lock);if (pd->entry[pde] == vm->scratch_pt) { -gen8_ppgtt_set_pde (vm, pd, pt, pde); - pd->entry[pde] = pt; -atomic_inc (&pd->used); +set_pd_entry (pd, pde, pt); }else { alloc = pt; pt = pd->entry[pde];
@@ -1458,13 +1443,11 @@ static int gen8_ppgtt_alloc_pdp(struct i915_address_space *vm, goto unwind; } -init_pd_with_page (vm, pd, vm->scratch_pt); +init_pd (vm, pd, vm->scratch_pt);spin_lock (&pdp->lock);if (pdp->entry[pdpe] == vm->scratch_pd) { -gen8_ppgtt_set_pdpe (pdp, pd, pdpe); - pdp->entry[pdpe] = pd; -atomic_inc (&pdp->used); +set_pd_entry (pdp, pdpe, pd); }else { alloc = pd; pd = pdp->entry[pdpe];
@@ -1490,12 +1473,9 @@ static int gen8_ppgtt_alloc_pdp(struct i915_address_space *vm, }spin_lock (&pdp->lock);if (atomic_dec_and_test (&pd->used)) { -gen8_ppgtt_set_pdpe (pdp, vm->scratch_pd, pdpe); - pdp->entry[pdpe] = vm->scratch_pd; -GEM_BUG_ON (!atomic_read (&pdp->used)); -atomic_dec (&pdp->used);GEM_BUG_ON (alloc); alloc = pd;/* defer the free to after the lock */ +clear_pd_entry (pdp, pdpe, vm->scratch_pd); }spin_unlock (&pdp->lock); unwind:
@@ -1540,8 +1520,7 @@ static int gen8_ppgtt_alloc_4lvl(struct i915_address_space *vm,spin_lock (&pml4->lock);if (pml4->entry[pml4e] == vm->scratch_pdp) { -gen8_ppgtt_set_pml4e (pml4, pdp, pml4e); - pml4->entry[pml4e] = pdp; +set_pd_entry (pml4, pml4e, pdp); }else { alloc = pdp; pdp = pml4->entry[pml4e];
@@ -1567,10 +1546,9 @@ static int gen8_ppgtt_alloc_4lvl(struct i915_address_space *vm, }spin_lock (&pml4->lock);if (atomic_dec_and_test (&pdp->used)) { -gen8_ppgtt_set_pml4e (pml4, vm->scratch_pdp, pml4e); - pml4->entry[pml4e] = vm->scratch_pdp;GEM_BUG_ON (alloc); alloc = pdp;/* defer the free until after the lock */ +clear_pd_entry (pml4, pml4e, vm->scratch_pdp); }spin_unlock (&pml4->lock); unwind:
@@ -1595,20 +1573,16 @@ static int gen8_preallocate_top_level_pdp(struct i915_ppgtt *ppgtt)if (IS_ERR (pd)) goto unwind; -init_pd_with_page (vm, pd, vm->scratch_pt); -gen8_ppgtt_set_pdpe (pdp, pd, pdpe); - -atomic_inc (&pdp->used); +init_pd (vm, pd, vm->scratch_pt); +set_pd_entry (pdp, pdpe, pd); } -atomic_inc (&pdp->used);/* never remove */ -return 0 ; unwind: start -= from;gen8_for_each_pdpe (pd, pdp, from, start, pdpe) { -gen8_ppgtt_set_pdpe (pdp, vm->scratch_pd, pdpe); +clear_pd_entry (pdp, pdpe, vm->scratch_pd);free_pd (vm, pd); }atomic_set (&pdp->used,0 );
drivers/gpu/drm/i915/i915_gem_gtt.h +0 -3
@@ -72,9 +72,6 @@ struct intel_gt;typedef u32 gen6_pte_t ;typedef u64 gen8_pte_t ; -typedef u64 gen8_pde_t ; -typedef u64 gen8_ppgtt_pdpe_t ; -typedef u64 gen8_ppgtt_pml4e_t ;#define ggtt_total_entries (ggtt) ((ggtt)->vm.total >> PAGE_SHIFT)
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/4 drm/i915/gtt: Tear down setup and cleanup macros for page dma
We don't use common codepaths to setup and cleanup page directories vs page tables. So their setup and cleanup macros are of no use.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +5 -7
@@ -594,8 +594,6 @@ static void cleanup_page_dma(struct i915_address_space *vm,#define kmap_atomic_px (px) kmap_atomic(px_base(px)->page) -#define setup_px (vm, px) setup_page_dma((vm), px_base(px)) -#define cleanup_px (vm, px) cleanup_page_dma((vm), px_base(px))#define fill_px (vm, px, v) fill_page_dma((vm), px_base(px), (v))#define fill32_px (vm, px, v) fill_page_dma_32((vm), px_base(px), (v))
@@ -697,7 +695,7 @@ static struct i915_page_table *alloc_pt(struct i915_address_space *vm)if (unlikely (!pt))return ERR_PTR (-ENOMEM ); -if (unlikely (setup_px (vm, pt))) { +if (unlikely (setup_page_dma (vm, &pt->base))) {kfree (pt);return ERR_PTR (-ENOMEM ); }
@@ -709,7 +707,7 @@ static struct i915_page_table *alloc_pt(struct i915_address_space *vm)static void free_pt (struct i915_address_space *vm,struct i915_page_table *pt) { -cleanup_px (vm, pt); +cleanup_page_dma (vm, &pt->base);kfree (pt); }
@@ -752,7 +750,7 @@ static struct i915_page_directory *alloc_pd(struct i915_address_space *vm)if (unlikely (!pd))return ERR_PTR (-ENOMEM ); -if (unlikely (setup_px (vm, pd))) { +if (unlikely (setup_page_dma (vm, &pd->base))) {kfree (pd);return ERR_PTR (-ENOMEM ); }
@@ -769,7 +767,7 @@ static void free_pd(struct i915_address_space *vm, struct i915_page_directory *pd) {if (likely (pd_has_phys_page (pd))) -cleanup_px (vm, pd); +cleanup_page_dma (vm, &pd->base);kfree (pd); }
@@ -1649,7 +1647,7 @@ static struct i915_ppgtt *gen8_ppgtt_create(struct drm_i915_private *i915) }if (i915_vm_is_4lvl (&ppgtt->vm)) { - err =setup_px (&ppgtt->vm, ppgtt->pd); + err =setup_page_dma (&ppgtt->vm, &ppgtt->pd->base);if (err) goto err_free_pdp;
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/4 drm/i915/gtt: Setup phys pages for 3lvl pdps
In reply to Mika KuoppalaIf we setup backing phys page for 3lvl pdps, even they are not used, we lose 5 pages per ppgtt.
Trading this memory on bsw, we gain more common code paths for all gen8+ directory manipulation. And those paths are now void of checks for page directory type, making the hot paths faster.
v2: don't shortcut vm (Chris)
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 77 +++++++++++++++++++---------- 1 file changed, 50 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +50 -27
@@ -758,22 +758,14 @@ static struct i915_page_directory *alloc_pd(struct i915_address_space *vm)return pd; } -static inline bool pd_has_phys_page (const struct i915_page_directory *const pd) -{ -return pd->base.page; -} -static void free_pd (struct i915_address_space *vm,struct i915_page_directory *pd) { -if (likely (pd_has_phys_page (pd))) -cleanup_page_dma (vm, &pd->base); - +cleanup_page_dma (vm, &pd->base);kfree (pd); }#define init_pd (vm, pd, to) { \ - GEM_DEBUG_BUG_ON(!pd_has_phys_page(pd)); \ fill_px((vm), (pd), gen8_pde_encode(px_dma(to), I915_CACHE_LLC)); \ memset_p((pd)->entry, (to), 512); \ }
@@ -1604,6 +1596,50 @@ static void ppgtt_init(struct i915_ppgtt *ppgtt, struct intel_gt *gt) ppgtt->vm.vma_ops.clear_pages = clear_pages; } +static void init_pd_n (struct i915_address_space *vm, +struct i915_page_directory *pd, +struct i915_page_directory *to, +const unsigned int entries) +{ +const u64 daddr =gen8_pde_encode (px_dma (to),I915_CACHE_LLC ); +u64 *const vaddr =kmap_atomic (pd->base.page); + +memset64 (vaddr, daddr, entries); +kunmap_atomic (vaddr); + +memset_p (pd->entry, to, entries); +} + +static struct i915_page_directory * +gen8_alloc_top_pd (struct i915_address_space *vm) +{ +struct i915_page_directory *pd; + +if (i915_vm_is_4lvl (vm)) { + pd =alloc_pd (vm); +if (!IS_ERR (pd)) +init_pd (vm, pd, vm->scratch_pdp); + +return pd; + } + +/* 3lvl */ + pd =__alloc_pd (); +if (!pd) +return ERR_PTR (-ENOMEM ); + + pd->entry[GEN8_3LVL_PDPES ] =NULL ; + +if (unlikely (setup_page_dma (vm, &pd->base))) { +kfree (pd); +return ERR_PTR (-ENOMEM ); + } + +init_pd_n (vm, pd, vm->scratch_pd,GEN8_3LVL_PDPES ); + +return pd; +} +/* * GEN8 legacy ppgtt programming is accomplished through a max 4 PDP registers * with a net effect resembling a 2-level page table in normal x86 terms. Each
@@ -1640,34 +1676,21 @@ static struct i915_ppgtt *gen8_ppgtt_create(struct drm_i915_private *i915)if (err) goto err_free; - ppgtt->pd =__alloc_pd (); -if (!ppgtt->pd) { - err = -ENOMEM ; + ppgtt->pd =gen8_alloc_top_pd (&ppgtt->vm); +if (IS_ERR (ppgtt->pd)) { + err =PTR_ERR (ppgtt->pd); goto err_free_scratch; }if (i915_vm_is_4lvl (&ppgtt->vm)) { - err =setup_page_dma (&ppgtt->vm, &ppgtt->pd->base); -if (err) - goto err_free_pdp; - -init_pd (&ppgtt->vm, ppgtt->pd, ppgtt->vm.scratch_pdp); - ppgtt->vm.allocate_va_range = gen8_ppgtt_alloc_4lvl; ppgtt->vm.insert_entries = gen8_ppgtt_insert_4lvl; ppgtt->vm.clear_range = gen8_ppgtt_clear_4lvl; }else { -/* -* We don't need to setup dma for top level pdp, only -* for entries. So point entries to scratch. -*/ -memset_p (ppgtt->pd->entry, ppgtt->vm.scratch_pd, -GEN8_3LVL_PDPES ); -if (intel_vgpu_active (i915)) { err =gen8_preallocate_top_level_pdp (ppgtt);if (err) - goto err_free_pdp; + goto err_free_pd; } ppgtt->vm.allocate_va_range = gen8_ppgtt_alloc_3lvl;
@@ -1682,7 +1705,7 @@ static struct i915_ppgtt *gen8_ppgtt_create(struct drm_i915_private *i915)return ppgtt; -err_free_pdp: +err_free_pd:free_pd (&ppgtt->vm, ppgtt->pd); err_free_scratch:gen8_free_scratch (&ppgtt->vm);
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/4 drm/i915/gtt: Introduce release_pd_entry
In reply to Mika KuoppalaBy encapsulating the locking upper level and used check for entry into a helper function, we can use it in all callsites.
v2: get rid of atomic_reads on lower level clears (Chris)
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 125 +++++++++++++--------------- 1 file changed, 60 insertions(+), 65 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +60 -65
@@ -813,6 +813,42 @@ __clear_pd_entry(struct i915_page_directory * const pd,#define clear_pd_entry (pd, pde, to) \ __clear_pd_entry((pd), (pde), px_base(to), gen8_pde_encode) +static bool +release_pt_entry (struct i915_page_directory *const pd, +const unsigned short pde, +struct i915_page_table *const pt, +struct i915_page_table *const scratch) +{ +bool free = false; + +spin_lock (&pd->lock); +if (atomic_dec_and_test (&pt->used)) { +clear_pd_entry (pd, pde, scratch); + free = true; + } +spin_unlock (&pd->lock); + +return free; +} + +static bool +release_pd_entry (struct i915_page_directory *const pd, +const unsigned short pde, +struct i915_page_directory *const entry, +struct i915_page_directory *const scratch) +{ +bool free = false; + +spin_lock (&pd->lock); +if (atomic_dec_and_test (&entry->used)) { +clear_pd_entry (pd, pde, scratch); + free = true; + } +spin_unlock (&pd->lock); + +return free; +} +/* * PDE TLBs are a pain to invalidate on GEN8+. When we modify * the page table structures, we mark them dirty so that
@@ -827,11 +863,11 @@ static void mark_tlbs_dirty(struct i915_ppgtt *ppgtt)/* Removes entries from a single page table, releasing it if it's empty. * Caller can use the return value to update higher-level entries. */ -static bool gen8_ppgtt_clear_pt (const struct i915_address_space *vm, +static void gen8_ppgtt_clear_pt (const struct i915_address_space *vm,struct i915_page_table *pt,u64 start,u64 length) { -unsigned int num_entries =gen8_pte_count (start, length); +const unsigned int num_entries =gen8_pte_count (start, length);gen8_pte_t *vaddr; vaddr =kmap_atomic_px (pt);
@@ -839,10 +875,11 @@ static bool gen8_ppgtt_clear_pt(const struct i915_address_space *vm,kunmap_atomic (vaddr);GEM_BUG_ON (num_entries >atomic_read (&pt->used)); -return !atomic_sub_return (num_entries, &pt->used); + +atomic_sub (num_entries, &pt->used); } -static bool gen8_ppgtt_clear_pd (struct i915_address_space *vm, +static void gen8_ppgtt_clear_pd (struct i915_address_space *vm,struct i915_page_directory *pd,u64 start,u64 length) {
@@ -850,30 +887,21 @@ static bool gen8_ppgtt_clear_pd(struct i915_address_space *vm,u32 pde;gen8_for_each_pde (pt, pd, start, length, pde) { -bool free = false; -GEM_BUG_ON (pt == vm->scratch_pt); -if (!gen8_ppgtt_clear_pt (vm, pt, start, length)) -continue ; +atomic_inc (&pt->used); -spin_lock (&pd->lock); -if (!atomic_read (&pt->used)) { -clear_pd_entry (pd, pde, vm->scratch_pt); - free = true; - } -spin_unlock (&pd->lock); -if (free) +gen8_ppgtt_clear_pt (vm, pt, start, length); + +if (release_pt_entry (pd, pde, pt, vm->scratch_pt))free_pt (vm, pt); } - -return !atomic_read (&pd->used); }/* Removes entries from a single page dir pointer, releasing it if it's empty. * Caller can use the return value to update higher-level entries */ -static bool gen8_ppgtt_clear_pdp (struct i915_address_space *vm, +static void gen8_ppgtt_clear_pdp (struct i915_address_space *vm,struct i915_page_directory *const pdp,u64 start,u64 length) {
@@ -881,24 +909,15 @@ static bool gen8_ppgtt_clear_pdp(struct i915_address_space *vm,unsigned int pdpe;gen8_for_each_pdpe (pd, pdp, start, length, pdpe) { -bool free = false; -GEM_BUG_ON (pd == vm->scratch_pd); -if (!gen8_ppgtt_clear_pd (vm, pd, start, length)) -continue ; +atomic_inc (&pd->used); -spin_lock (&pdp->lock); -if (!atomic_read (&pd->used)) { -clear_pd_entry (pdp, pdpe, vm->scratch_pd); - free = true; - } -spin_unlock (&pdp->lock); -if (free) +gen8_ppgtt_clear_pd (vm, pd, start, length); + +if (release_pd_entry (pdp, pdpe, pd, vm->scratch_pd))free_pd (vm, pd); } - -return !atomic_read (&pdp->used); } static void gen8_ppgtt_clear_3lvl(struct i915_address_space *vm,
@@ -922,19 +941,13 @@ static void gen8_ppgtt_clear_4lvl(struct i915_address_space *vm,GEM_BUG_ON (!i915_vm_is_4lvl (vm));gen8_for_each_pml4e (pdp, pml4, start, length, pml4e) { -bool free = false;GEM_BUG_ON (pdp == vm->scratch_pdp); -if (!gen8_ppgtt_clear_pdp (vm, pdp, start, length)) -continue ; +atomic_inc (&pdp->used); -spin_lock (&pml4->lock); -if (!atomic_read (&pdp->used)) { -clear_pd_entry (pml4, pml4e, vm->scratch_pdp); - free = true; - } -spin_unlock (&pml4->lock); -if (free) +gen8_ppgtt_clear_pdp (vm, pdp, start, length); + +if (release_pd_entry (pml4, pml4e, pdp, vm->scratch_pdp))free_pd (vm, pdp); } }
@@ -1457,17 +1470,8 @@ static int gen8_ppgtt_alloc_pdp(struct i915_address_space *vm, goto out; unwind_pd: -if (alloc) { -free_pd (vm, alloc); - alloc =NULL ; - } -spin_lock (&pdp->lock); -if (atomic_dec_and_test (&pd->used)) { -GEM_BUG_ON (alloc); - alloc = pd;/* defer the free to after the lock */ -clear_pd_entry (pdp, pdpe, vm->scratch_pd); - } -spin_unlock (&pdp->lock); +if (release_pd_entry (pdp, pdpe, pd, vm->scratch_pd)) +free_pd (vm, pd); unwind:gen8_ppgtt_clear_pdp (vm, pdp, from, start - from); out:
@@ -1530,17 +1534,8 @@ static int gen8_ppgtt_alloc_4lvl(struct i915_address_space *vm, goto out; unwind_pdp: -if (alloc) { -free_pd (vm, alloc); - alloc =NULL ; - } -spin_lock (&pml4->lock); -if (atomic_dec_and_test (&pdp->used)) { -GEM_BUG_ON (alloc); - alloc = pdp;/* defer the free until after the lock */ -clear_pd_entry (pml4, pml4e, vm->scratch_pdp); - } -spin_unlock (&pml4->lock); +if (release_pd_entry (pml4, pml4e, pdp, vm->scratch_pdp)) +free_pd (vm, pdp); unwind:gen8_ppgtt_clear_4lvl (vm, from, start - from); out:
@@ -1572,8 +1567,8 @@ static int gen8_preallocate_top_level_pdp(struct i915_ppgtt *ppgtt) unwind: start -= from;gen8_for_each_pdpe (pd, pdp, from, start, pdpe) { -clear_pd_entry (pdp, pdpe, vm->scratch_pd); -free_pd (vm, pd); +if (release_pd_entry (pdp, pdpe, pd, vm->scratch_pd)) +free_pd (vm, pd); }atomic_set (&pdp->used,0 );return -ENOMEM ;
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/gtt: Introduce release_pd_entry
From: Mika Kuoppala <[email protected]>
By encapsulating the locking upper level and used check for entry into a helper function, we can use it in all callsites.
v2: get rid of atomic_reads on lower level clears (Chris)
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 109 +++++++++++----------------- 1 file changed, 41 insertions(+), 68 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +41 -68
@@ -813,6 +813,24 @@ __clear_pd_entry(struct i915_page_directory * const pd,#define clear_pd_entry (pd, pde, to) \ __clear_pd_entry((pd), (pde), px_base(to), gen8_pde_encode) +static bool +release_pd_entry (struct i915_page_directory *const pd, +const unsigned short pde, +atomic_t *counter, +void *const scratch) +{ +bool free = false; + +spin_lock (&pd->lock); +if (atomic_dec_and_test (counter)) { +clear_pd_entry (pd, pde, scratch); + free = true; + } +spin_unlock (&pd->lock); + +return free; +} +/* * PDE TLBs are a pain to invalidate on GEN8+. When we modify * the page table structures, we mark them dirty so that
@@ -827,11 +845,11 @@ static void mark_tlbs_dirty(struct i915_ppgtt *ppgtt)/* Removes entries from a single page table, releasing it if it's empty. * Caller can use the return value to update higher-level entries. */ -static bool gen8_ppgtt_clear_pt (const struct i915_address_space *vm, +static void gen8_ppgtt_clear_pt (const struct i915_address_space *vm,struct i915_page_table *pt,u64 start,u64 length) { -unsigned int num_entries =gen8_pte_count (start, length); +const unsigned int num_entries =gen8_pte_count (start, length);gen8_pte_t *vaddr; vaddr =kmap_atomic_px (pt);
@@ -839,10 +857,11 @@ static bool gen8_ppgtt_clear_pt(const struct i915_address_space *vm,kunmap_atomic (vaddr);GEM_BUG_ON (num_entries >atomic_read (&pt->used)); -return !atomic_sub_return (num_entries, &pt->used); + +atomic_sub (num_entries, &pt->used); } -static bool gen8_ppgtt_clear_pd (struct i915_address_space *vm, +static void gen8_ppgtt_clear_pd (struct i915_address_space *vm,struct i915_page_directory *pd,u64 start,u64 length) {
@@ -850,30 +869,21 @@ static bool gen8_ppgtt_clear_pd(struct i915_address_space *vm,u32 pde;gen8_for_each_pde (pt, pd, start, length, pde) { -bool free = false; -GEM_BUG_ON (pt == vm->scratch_pt); -if (!gen8_ppgtt_clear_pt (vm, pt, start, length)) -continue ; +atomic_inc (&pt->used); -spin_lock (&pd->lock); -if (!atomic_read (&pt->used)) { -clear_pd_entry (pd, pde, vm->scratch_pt); - free = true; - } -spin_unlock (&pd->lock); -if (free) +gen8_ppgtt_clear_pt (vm, pt, start, length); + +if (release_pd_entry (pd, pde, &pt->used, vm->scratch_pt))free_pt (vm, pt); } - -return !atomic_read (&pd->used); }/* Removes entries from a single page dir pointer, releasing it if it's empty. * Caller can use the return value to update higher-level entries */ -static bool gen8_ppgtt_clear_pdp (struct i915_address_space *vm, +static void gen8_ppgtt_clear_pdp (struct i915_address_space *vm,struct i915_page_directory *const pdp,u64 start,u64 length) {
@@ -881,24 +891,15 @@ static bool gen8_ppgtt_clear_pdp(struct i915_address_space *vm,unsigned int pdpe;gen8_for_each_pdpe (pd, pdp, start, length, pdpe) { -bool free = false; -GEM_BUG_ON (pd == vm->scratch_pd); -if (!gen8_ppgtt_clear_pd (vm, pd, start, length)) -continue ; +atomic_inc (&pd->used); -spin_lock (&pdp->lock); -if (!atomic_read (&pd->used)) { -clear_pd_entry (pdp, pdpe, vm->scratch_pd); - free = true; - } -spin_unlock (&pdp->lock); -if (free) +gen8_ppgtt_clear_pd (vm, pd, start, length); + +if (release_pd_entry (pdp, pdpe, &pd->used, vm->scratch_pd))free_pd (vm, pd); } - -return !atomic_read (&pdp->used); } static void gen8_ppgtt_clear_3lvl(struct i915_address_space *vm,
@@ -922,19 +923,13 @@ static void gen8_ppgtt_clear_4lvl(struct i915_address_space *vm,GEM_BUG_ON (!i915_vm_is_4lvl (vm));gen8_for_each_pml4e (pdp, pml4, start, length, pml4e) { -bool free = false;GEM_BUG_ON (pdp == vm->scratch_pdp); -if (!gen8_ppgtt_clear_pdp (vm, pdp, start, length)) -continue ; +atomic_inc (&pdp->used); -spin_lock (&pml4->lock); -if (!atomic_read (&pdp->used)) { -clear_pd_entry (pml4, pml4e, vm->scratch_pdp); - free = true; - } -spin_unlock (&pml4->lock); -if (free) +gen8_ppgtt_clear_pdp (vm, pdp, start, length); + +if (release_pd_entry (pml4, pml4e, &pdp->used, vm->scratch_pdp))free_pd (vm, pdp); } }
@@ -1457,17 +1452,8 @@ static int gen8_ppgtt_alloc_pdp(struct i915_address_space *vm, goto out; unwind_pd: -if (alloc) { -free_pd (vm, alloc); - alloc =NULL ; - } -spin_lock (&pdp->lock); -if (atomic_dec_and_test (&pd->used)) { -GEM_BUG_ON (alloc); - alloc = pd;/* defer the free to after the lock */ -clear_pd_entry (pdp, pdpe, vm->scratch_pd); - } -spin_unlock (&pdp->lock); +if (release_pd_entry (pdp, pdpe, &pd->used, vm->scratch_pd)) +free_pd (vm, pd); unwind:gen8_ppgtt_clear_pdp (vm, pdp, from, start - from); out:
@@ -1530,17 +1516,8 @@ static int gen8_ppgtt_alloc_4lvl(struct i915_address_space *vm, goto out; unwind_pdp: -if (alloc) { -free_pd (vm, alloc); - alloc =NULL ; - } -spin_lock (&pml4->lock); -if (atomic_dec_and_test (&pdp->used)) { -GEM_BUG_ON (alloc); - alloc = pdp;/* defer the free until after the lock */ -clear_pd_entry (pml4, pml4e, vm->scratch_pdp); - } -spin_unlock (&pml4->lock); +if (release_pd_entry (pml4, pml4e, &pdp->used, vm->scratch_pdp)) +free_pd (vm, pdp); unwind:gen8_ppgtt_clear_4lvl (vm, from, start - from); out:
@@ -1570,11 +1547,7 @@ static int gen8_preallocate_top_level_pdp(struct i915_ppgtt *ppgtt)return 0 ; unwind: - start -= from; -gen8_for_each_pdpe (pd, pdp, from, start, pdpe) { -clear_pd_entry (pdp, pdpe, vm->scratch_pd); -free_pd (vm, pd); - } +gen8_ppgtt_clear_pdp (vm, pdp, from, start - from);atomic_set (&pdp->used,0 );return -ENOMEM ; }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/gtt: Introduce release_pd_entry
In reply to Mika KuoppalaFrom: Mika Kuoppala <[email protected]>
By encapsulating the locking upper level and used check for entry into a helper function, we can use it in all callsites.
v2: get rid of atomic_reads on lower level clears (Chris)
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 121 +++++++++++----------------- 1 file changed, 47 insertions(+), 74 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +47 -74
@@ -795,10 +795,10 @@ __set_pd_entry(struct i915_page_directory * const pd, }static inline void -__clear_pd_entry (struct i915_page_directory *const pd, -const unsigned short pde, -struct i915_page_dma *const to, -u64 (*encode)(const dma_addr_t ,const enum i915_cache_level )) +clear_pd_entry (struct i915_page_directory *const pd, +const unsigned short pde, +struct i915_page_dma *const to, +u64 (*encode)(const dma_addr_t ,const enum i915_cache_level )) {GEM_BUG_ON (atomic_read (&pd->used) ==0 );
@@ -810,8 +810,23 @@ __clear_pd_entry(struct i915_page_directory * const pd,#define set_pd_entry (pd, pde, to) \ __set_pd_entry((pd), (pde), px_base(to), gen8_pde_encode) -#define clear_pd_entry (pd, pde, to) \ - __clear_pd_entry((pd), (pde), px_base(to), gen8_pde_encode) +static bool +release_pd_entry (struct i915_page_directory *const pd, +const unsigned short pde, +atomic_t *counter, +struct i915_page_dma *const scratch) +{ +bool free = false; + +spin_lock (&pd->lock); +if (atomic_dec_and_test (counter)) { +clear_pd_entry (pd, pde, scratch, gen8_pde_encode); + free = true; + } +spin_unlock (&pd->lock); + +return free; +}/* * PDE TLBs are a pain to invalidate on GEN8+. When we modify
@@ -827,11 +842,11 @@ static void mark_tlbs_dirty(struct i915_ppgtt *ppgtt)/* Removes entries from a single page table, releasing it if it's empty. * Caller can use the return value to update higher-level entries. */ -static bool gen8_ppgtt_clear_pt (const struct i915_address_space *vm, +static void gen8_ppgtt_clear_pt (const struct i915_address_space *vm,struct i915_page_table *pt,u64 start,u64 length) { -unsigned int num_entries =gen8_pte_count (start, length); +const unsigned int num_entries =gen8_pte_count (start, length);gen8_pte_t *vaddr; vaddr =kmap_atomic_px (pt);
@@ -839,10 +854,11 @@ static bool gen8_ppgtt_clear_pt(const struct i915_address_space *vm,kunmap_atomic (vaddr);GEM_BUG_ON (num_entries >atomic_read (&pt->used)); -return !atomic_sub_return (num_entries, &pt->used); + +atomic_sub (num_entries, &pt->used); } -static bool gen8_ppgtt_clear_pd (struct i915_address_space *vm, +static void gen8_ppgtt_clear_pd (struct i915_address_space *vm,struct i915_page_directory *pd,u64 start,u64 length) {
@@ -850,30 +866,22 @@ static bool gen8_ppgtt_clear_pd(struct i915_address_space *vm,u32 pde;gen8_for_each_pde (pt, pd, start, length, pde) { -bool free = false; -GEM_BUG_ON (pt == vm->scratch_pt); -if (!gen8_ppgtt_clear_pt (vm, pt, start, length)) -continue ; +atomic_inc (&pt->used); -spin_lock (&pd->lock); -if (!atomic_read (&pt->used)) { -clear_pd_entry (pd, pde, vm->scratch_pt); - free = true; - } -spin_unlock (&pd->lock); -if (free) +gen8_ppgtt_clear_pt (vm, pt, start, length); + +if (release_pd_entry (pd, pde, &pt->used, +px_base (vm->scratch_pt)))free_pt (vm, pt); } - -return !atomic_read (&pd->used); }/* Removes entries from a single page dir pointer, releasing it if it's empty. * Caller can use the return value to update higher-level entries */ -static bool gen8_ppgtt_clear_pdp (struct i915_address_space *vm, +static void gen8_ppgtt_clear_pdp (struct i915_address_space *vm,struct i915_page_directory *const pdp,u64 start,u64 length) {
@@ -881,24 +889,16 @@ static bool gen8_ppgtt_clear_pdp(struct i915_address_space *vm,unsigned int pdpe;gen8_for_each_pdpe (pd, pdp, start, length, pdpe) { -bool free = false; -GEM_BUG_ON (pd == vm->scratch_pd); -if (!gen8_ppgtt_clear_pd (vm, pd, start, length)) -continue ; +atomic_inc (&pd->used); -spin_lock (&pdp->lock); -if (!atomic_read (&pd->used)) { -clear_pd_entry (pdp, pdpe, vm->scratch_pd); - free = true; - } -spin_unlock (&pdp->lock); -if (free) +gen8_ppgtt_clear_pd (vm, pd, start, length); + +if (release_pd_entry (pdp, pdpe, &pd->used, +px_base (vm->scratch_pd)))free_pd (vm, pd); } - -return !atomic_read (&pdp->used); } static void gen8_ppgtt_clear_3lvl(struct i915_address_space *vm,
@@ -922,19 +922,14 @@ static void gen8_ppgtt_clear_4lvl(struct i915_address_space *vm,GEM_BUG_ON (!i915_vm_is_4lvl (vm));gen8_for_each_pml4e (pdp, pml4, start, length, pml4e) { -bool free = false;GEM_BUG_ON (pdp == vm->scratch_pdp); -if (!gen8_ppgtt_clear_pdp (vm, pdp, start, length)) -continue ; +atomic_inc (&pdp->used); -spin_lock (&pml4->lock); -if (!atomic_read (&pdp->used)) { -clear_pd_entry (pml4, pml4e, vm->scratch_pdp); - free = true; - } -spin_unlock (&pml4->lock); -if (free) +gen8_ppgtt_clear_pdp (vm, pdp, start, length); + +if (release_pd_entry (pml4, pml4e, &pdp->used, +px_base (vm->scratch_pdp)))free_pd (vm, pdp); } }
@@ -1457,17 +1452,8 @@ static int gen8_ppgtt_alloc_pdp(struct i915_address_space *vm, goto out; unwind_pd: -if (alloc) { -free_pd (vm, alloc); - alloc =NULL ; - } -spin_lock (&pdp->lock); -if (atomic_dec_and_test (&pd->used)) { -GEM_BUG_ON (alloc); - alloc = pd;/* defer the free to after the lock */ -clear_pd_entry (pdp, pdpe, vm->scratch_pd); - } -spin_unlock (&pdp->lock); +if (release_pd_entry (pdp, pdpe, &pd->used,px_base (vm->scratch_pd))) +free_pd (vm, pd); unwind:gen8_ppgtt_clear_pdp (vm, pdp, from, start - from); out:
@@ -1530,17 +1516,8 @@ static int gen8_ppgtt_alloc_4lvl(struct i915_address_space *vm, goto out; unwind_pdp: -if (alloc) { -free_pd (vm, alloc); - alloc =NULL ; - } -spin_lock (&pml4->lock); -if (atomic_dec_and_test (&pdp->used)) { -GEM_BUG_ON (alloc); - alloc = pdp;/* defer the free until after the lock */ -clear_pd_entry (pml4, pml4e, vm->scratch_pdp); - } -spin_unlock (&pml4->lock); +if (release_pd_entry (pml4, pml4e, &pdp->used,px_base (vm->scratch_pdp))) +free_pd (vm, pdp); unwind:gen8_ppgtt_clear_4lvl (vm, from, start - from); out:
@@ -1570,11 +1547,7 @@ static int gen8_preallocate_top_level_pdp(struct i915_ppgtt *ppgtt)return 0 ; unwind: - start -= from; -gen8_for_each_pdpe (pd, pdp, from, start, pdpe) { -clear_pd_entry (pdp, pdpe, vm->scratch_pd); -free_pd (vm, pd); - } +gen8_ppgtt_clear_pdp (vm, pdp, from, start - from);atomic_set (&pdp->used,0 );return -ENOMEM ; }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/gtt: Introduce release_pd_entry
Quoting Chris Wilson (2019-07-05 16:07:13)
Quoted 9 lines
From: Mika Kuoppala <[email protected]>
By encapsulating the locking upper level and used check for entry into a helper function, we can use it in all callsites.
v2: get rid of
atomic_readson lower level clears (Chris)Cc Chris Wilson <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>
A nice bit of needless duplicity eliminated.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] drm/i915/gtt: pde entry encoding is identical (rev3)
In reply to Mika Kuoppala== Series Details ==
== Series Details ==
Series: series starting with [1/4] drm/i915/gtt: pde entry encoding is identical (rev3)
URL : https://patchwork.freedesktop.org/series/63284/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
44d181c48441 drm/i915/gtt: pde entry encoding is identical
-:56: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'pd' - possible side-effects?
#56: FILE: drivers/gpu/drm/i915/i915_gem_gtt.c:777:
+#define init_pd(vm, pd, to) { \
+ GEM_DEBUG_BUG_ON(!pd_has_phys_page(pd)); \
+ fill_px((vm), (pd), gen8_pde_encode(px_dma(to), I915_CACHE_LLC)); \
+ memset_p((pd)->entry, (to), 512); \
+}-:56: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'to' - possible side-effects? #56: FILE: drivers/gpu/drm/i915/i915_gem_gtt.c:777:
+#define init_pd(vm, pd, to) { \
+ GEM_DEBUG_BUG_ON(!pd_has_phys_page(pd)); \
+ fill_px((vm), (pd), gen8_pde_encode(px_dma(to), I915_CACHE_LLC)); \
+ memset_p((pd)->entry, (to), 512); \
+}
total: 0 errors, 0 warnings, 2 checks, 285 lines checked 6dabe15619bc drm/i915/gtt: Tear down setup and cleanup macros for page dma 60f62dee7e02 drm/i915/gtt: Setup phys pages for 3lvl pdps 3327784fcffb drm/i915/gtt: Introduce release_pd_entry
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for series starting with [1/4] drm/i915/gtt: pde entry encoding is identical (rev3)
In reply to Mika Kuoppala== Series Details ==
== Series Details ==
Series: series starting with [1/4] drm/i915/gtt: pde entry encoding is identical (rev3)
URL : https://patchwork.freedesktop.org/series/63284/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915/gtt: pde entry encoding is identical -O:drivers/gpu/drm/i915/i915_gem_gtt.c:1610:9: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:1610:9: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_gem_gtt.c:1584:9: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_gem_gtt.c:1584:9: warning: expression using sizeof(void)
Commit: drm/i915/gtt: Tear down setup and cleanup macros for page dma Okay!
Commit: drm/i915/gtt: Setup phys pages for 3lvl pdps Okay!
Commit: drm/i915/gtt: Introduce release_pd_entry -O:drivers/gpu/drm/i915/i915_gem_gtt.c:1574:9: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:1574:9: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:852:9: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:852:9: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:883:9: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:883:9: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:924:9: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:924:9: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_gem_gtt.c:868:9: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_gem_gtt.c:868:9: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_gem_gtt.c:891:9: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_gem_gtt.c:891:9: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_gem_gtt.c:924:9: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_gem_gtt.c:924:9: warning: expression using sizeof(void)
_______________________________________________
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/gtt: pde entry encoding is identical (rev3)
In reply to Mika Kuoppala== Series Details ==
== Series Details ==
Series: series starting with [1/4] drm/i915/gtt: pde entry encoding is identical (rev3)
URL : https://patchwork.freedesktop.org/series/63284/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6425 -> Patchwork_13550
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/
Known issues
------------
Here are the changes found in Patchwork_13550 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_render_linear_blits@basic:
- fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/fi-icl-u3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/fi-icl-u3/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-skl-6770hq: [PASS][3] -> [FAIL][4] ([fdo#108511])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/fi-skl-6770hq/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/fi-skl-6770hq/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [PASS][5] -> [FAIL][6] ([fdo#109485])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/fi-kbl-7500u/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/fi-kbl-7500u/igt@[email protected]
#### Possible fixes ####
* {igt@gem_ctx_switch@legacy-render}:
- fi-icl-u2: [INCOMPLETE][7] ([fdo#107713]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/fi-icl-u2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/fi-icl-u2/igt@[email protected]
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: [INCOMPLETE][9] ([fdo#107718]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/fi-blb-e6850/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/fi-blb-e6850/igt@[email protected]
* igt@gem_mmap_gtt@basic-write-read-distinct:
- fi-icl-u3: [DMESG-WARN][11] ([fdo#107724]) -> [PASS][12] +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/fi-icl-u3/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/fi-icl-u3/igt@[email protected]
* igt@i915_selftest@live_contexts:
- fi-skl-iommu: [INCOMPLETE][13] ([fdo#111050]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/fi-skl-iommu/igt@i915_selftest@live_contexts.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/fi-skl-iommu/igt@i915_selftest@live_contexts.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7567u: [FAIL][15] ([fdo#109485]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/fi-kbl-7567u/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/fi-kbl-7567u/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108511]: https://bugs.freedesktop.org/show_bug.cgi?id=108511
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[fdo#109635 ]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
[fdo#110387]: https://bugs.freedesktop.org/show_bug.cgi?id=110387
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111046 ]: https://bugs.freedesktop.org/show_bug.cgi?id=111046
[fdo#111050]: https://bugs.freedesktop.org/show_bug.cgi?id=111050
Participating hosts (55 -> 46)
------------------------------
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-bsw-n3050 fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6425 -> Patchwork_13550
CI_DRM_6425: 62149faa04e66d4d16166c89ba441977a0656119 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5087: f0e39642f6f8da5406627bfa79c6600df949e203 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13550: 3327784fcffbbd12b93280d4b64417c959eedbc6 @ git://anongit.freedesktop.org/gfx-ci/linux
== Kernel 32bit build ==
Warning: Kernel 32bit buildtest failed:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/build_32bit.log
CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh CHK include/generated/compile.h
Kernel: arch/x86/boot/bzImage is ready (#1)
Building modules, stage 2.
MODPOST 112 modules
ERROR: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "__divdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! scripts/Makefile.modpost:91: recipe for target '__modpost' failed make[1]: *** [__modpost] Error 1
Makefile:1287: recipe for target 'modules' failed
make: *** [modules] Error 2
== Linux commits ==
3327784fcffb drm/i915/gtt: Introduce release_pd_entry 60f62dee7e02 drm/i915/gtt: Setup phys pages for 3lvl pdps 6dabe15619bc drm/i915/gtt: Tear down setup and cleanup macros for page dma 44d181c48441 drm/i915/gtt: pde entry encoding is identical
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Mika Kuoppala (2019-07-05 15:29:05)
Quoted 7 lines
For all page directory entries, the pde encoding is identical. Don't compilicate call sites with different versions of doing the same thing. We check the existence of physical page before writing the entry into it. This further generalizes the pd so that manipulation in callsites will be identical, removing the need to handle pdps differently for gen8.
Quoted 7 lines
v2: squash
v3: inc/dec with set/clear (Chris)
v4: inlines, warn, strayset_pd(Chris)Cc Chris Wilson <[email protected]>Cc Matthew Auld <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>
-Chris
_______________________________________________
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/gtt: pde entry encoding is identical (rev3)
In reply to Mika Kuoppala== Series Details ==
== Series Details ==
Series: series starting with [1/4] drm/i915/gtt: pde entry encoding is identical (rev3)
URL : https://patchwork.freedesktop.org/series/63284/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6425_full -> Patchwork_13550_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13550_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@vecs0-s3:
- shard-skl: [PASS][1] -> [INCOMPLETE][2] ([fdo#104108])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-skl7/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-skl8/igt@[email protected]
* igt@i915_pm_rps@waitboost:
- shard-glk: [PASS][3] -> [FAIL][4] ([fdo#102250])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-glk5/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-glk4/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][5] -> [DMESG-WARN][6] ([fdo#108566]) +4 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-apl7/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-apl1/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-256x85-offscreen:
- shard-hsw: [PASS][7] -> [INCOMPLETE][8] ([fdo#103540])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-hsw1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-hsw1/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#105363])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-skl3/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-skl5/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-blt:
- shard-iclb: [PASS][11] -> [FAIL][12] ([fdo#103167]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-iclb5/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-iclb2/igt@[email protected]
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#109441]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-iclb5/igt@kms_psr@psr2_cursor_mmap_cpu.html
#### Possible fixes ####
* igt@gem_ctx_isolation@vcs0-s3:
- shard-kbl: [INCOMPLETE][15] ([fdo#103665]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-kbl6/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-kbl1/igt@[email protected]
* igt@gem_softpin@noreloc-s3:
- shard-skl: [INCOMPLETE][17] ([fdo#104108]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-skl7/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-skl2/igt@[email protected]
* igt@i915_pm_rpm@i2c:
- shard-hsw: [FAIL][19] ([fdo#104097]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-hsw4/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-hsw4/igt@[email protected]
* igt@i915_pm_rpm@system-suspend:
- shard-kbl: [INCOMPLETE][21] ([fdo#103665] / [fdo#107807]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-kbl4/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-kbl4/igt@[email protected]
* igt@i915_pm_rpm@system-suspend-modeset:
- shard-apl: [INCOMPLETE][23] ([fdo#103927]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-apl7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-apl5/igt@[email protected]
* igt@kms_flip@modeset-vs-vblank-race:
- shard-glk: [FAIL][25] ([fdo#103060]) -> [PASS][26] +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-glk6/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-glk2/igt@[email protected]
- shard-apl: [FAIL][27] ([fdo#103060]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-apl6/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-apl4/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
- shard-iclb: [FAIL][29] ([fdo#103167]) -> [PASS][30] +3 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-iclb6/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-iclb1/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-msflip-blt:
- shard-skl: [FAIL][31] ([fdo#108040]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-skl7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-msflip-blt.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-skl8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-msflip-blt.html
* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-gtt:
- shard-skl: [FAIL][33] ([fdo#103167] / [fdo#110379]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-skl7/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-skl8/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][35] ([fdo#108145]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-skl5/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-skl9/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][37] ([fdo#109642] / [fdo#111068]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-iclb6/igt@kms_psr2_su@page_flip.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-iclb2/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][39] ([fdo#109441]) -> [PASS][40] +3 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-iclb1/igt@kms_psr@psr2_sprite_plane_move.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][41] ([fdo#99912]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-apl8/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-apl1/igt@[email protected]
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-apl: [DMESG-WARN][43] ([fdo#108566]) -> [PASS][44] +3 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-apl3/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-apl2/igt@[email protected]
* igt@perf@blocking:
- shard-skl: [FAIL][45] ([fdo#110728]) -> [PASS][46] +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-skl6/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/shard-skl4/igt@[email protected]
[fdo#102250]: https://bugs.freedesktop.org/show_bug.cgi?id=102250
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104097]: https://bugs.freedesktop.org/show_bug.cgi?id=104097
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#108040]: https://bugs.freedesktop.org/show_bug.cgi?id=108040
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110379]: https://bugs.freedesktop.org/show_bug.cgi?id=110379
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (9 -> 10)
------------------------------
Additional (1): pig-skl-6260u
Build changes
-------------
* Linux: CI_DRM_6425 -> Patchwork_13550
CI_DRM_6425: 62149faa04e66d4d16166c89ba441977a0656119 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5087: f0e39642f6f8da5406627bfa79c6600df949e203 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13550: 3327784fcffbbd12b93280d4b64417c959eedbc6 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13550/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx