Re: [Intel-gfx] [PATCH] drm/i915: fixup pd vs pt confusion in gen6 ppgtt code

2013-03-20 Thread Paul Menzel 
Dear Daniel,


Am Dienstag, den 19.03.2013, 23:51 +0100 schrieb Daniel Vetter:
 The index variable points at a page table, not a page directory or a
 pde. Ben Widawsky fix this up correctly in his ppgtt cleanup, but I've

fix*ed*

 botched the job and copypasted the old confusion from the original
 gen6 ppgtt code in
 
 commit def886c3768d24c4e0aa56ff98b5a468c2b5c9bf
 Author: Daniel Vetter daniel.vet...@ffwll.ch
 Date:   Thu Jan 24 14:44:56 2013 -0800
 
 drm/i915: vfuncs for ppgtt
 
 Cc: Ben Widawsky b...@bwidawsk.net
 Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
 ---
  drivers/gpu/drm/i915/i915_gem_gtt.c |   14 +++---
  1 file changed, 7 insertions(+), 7 deletions(-)

Acked-by: Paul Menzel paulepan...@users.sourceforge.net


Thanks,

Paul


signature.asc
Description: This is a digitally signed message part
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] drm/i915: fixup pd vs pt confusion in gen6 ppgtt code

2013-03-19 Thread Daniel Vetter 
The index variable points at a page table, not a page directory or a
pde. Ben Widawsky fix this up correctly in his ppgtt cleanup, but I've
botched the job and copypasted the old confusion from the original
gen6 ppgtt code in

commit def886c3768d24c4e0aa56ff98b5a468c2b5c9bf
Author: Daniel Vetter daniel.vet...@ffwll.ch
Date:   Thu Jan 24 14:44:56 2013 -0800

drm/i915: vfuncs for ppgtt

Cc: Ben Widawsky b...@bwidawsk.net
Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
---
 drivers/gpu/drm/i915/i915_gem_gtt.c |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c 
b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 414dee4..4cbae7b 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -83,7 +83,7 @@ static void gen6_ppgtt_clear_range(struct i915_hw_ppgtt 
*ppgtt,
 {
gtt_pte_t *pt_vaddr;
gtt_pte_t scratch_pte;
-   unsigned act_pd = first_entry / I915_PPGTT_PT_ENTRIES;
+   unsigned act_pt = first_entry / I915_PPGTT_PT_ENTRIES;
unsigned first_pte = first_entry % I915_PPGTT_PT_ENTRIES;
unsigned last_pte, i;
 
@@ -96,7 +96,7 @@ static void gen6_ppgtt_clear_range(struct i915_hw_ppgtt 
*ppgtt,
if (last_pte  I915_PPGTT_PT_ENTRIES)
last_pte = I915_PPGTT_PT_ENTRIES;
 
-   pt_vaddr = kmap_atomic(ppgtt-pt_pages[act_pd]);
+   pt_vaddr = kmap_atomic(ppgtt-pt_pages[act_pt]);
 
for (i = first_pte; i  last_pte; i++)
pt_vaddr[i] = scratch_pte;
@@ -105,7 +105,7 @@ static void gen6_ppgtt_clear_range(struct i915_hw_ppgtt 
*ppgtt,
 
num_entries -= last_pte - first_pte;
first_pte = 0;
-   act_pd++;
+   act_pt++;
}
 }
 
@@ -115,11 +115,11 @@ static void gen6_ppgtt_insert_entries(struct 
i915_hw_ppgtt *ppgtt,
  enum i915_cache_level cache_level)
 {
gtt_pte_t *pt_vaddr;
-   unsigned act_pd = first_entry / I915_PPGTT_PT_ENTRIES;
+   unsigned act_pt = first_entry / I915_PPGTT_PT_ENTRIES;
unsigned act_pte = first_entry % I915_PPGTT_PT_ENTRIES;
struct sg_page_iter sg_iter;
 
-   pt_vaddr = kmap_atomic(ppgtt-pt_pages[act_pd]);
+   pt_vaddr = kmap_atomic(ppgtt-pt_pages[act_pt]);
for_each_sg_page(pages-sgl, sg_iter, pages-nents, 0) {
dma_addr_t page_addr;
 
@@ -129,8 +129,8 @@ static void gen6_ppgtt_insert_entries(struct i915_hw_ppgtt 
*ppgtt,
cache_level);
if (++act_pte == I915_PPGTT_PT_ENTRIES) {
kunmap_atomic(pt_vaddr);
-   act_pd++;
-   pt_vaddr = kmap_atomic(ppgtt-pt_pages[act_pd]);
+   act_pt++;
+   pt_vaddr = kmap_atomic(ppgtt-pt_pages[act_pt]);
act_pte = 0;
 
}
-- 
1.7.10.4

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: fixup pd vs pt confusion in gen6 ppgtt code

2013-03-19 Thread Ben Widawsky 
On Tue, Mar 19, 2013 at 11:51:21PM +0100, Daniel Vetter wrote:
 The index variable points at a page table, not a page directory or a
 pde. Ben Widawsky fix this up correctly in his ppgtt cleanup, but I've
 botched the job and copypasted the old confusion from the original
 gen6 ppgtt code in
 
 commit def886c3768d24c4e0aa56ff98b5a468c2b5c9bf
 Author: Daniel Vetter daniel.vet...@ffwll.ch
 Date:   Thu Jan 24 14:44:56 2013 -0800
 
 drm/i915: vfuncs for ppgtt
 
 Cc: Ben Widawsky b...@bwidawsk.net
 Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
Reviewed-by: Ben Widawsky b...@bwidawsk.net
[snip]
-- 
Ben Widawsky, Intel Open Source Technology Center
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx