Re: [Intel-gfx] [PATCH v2] drm/i915: Fix the kernel panic when using aliasing ppgtt

2017-07-07 Thread Chris Wilson
Quoting Chuanxiao Dong (2017-07-07 10:50:59)
> The ppgtt should be get directly from i915_address_space *vm instead of
> vma->vm.
> 
> v2:
> - add one more fix for bxt. (Chris)
> 
> Fixes: 4a234c5fae16 ("drm/i915: pass the vma to insert_entries")
> Bugzilla:https://bugs.freedesktop.org/show_bug.cgi?id=101713
> Signed-off-by: Chuanxiao Dong 
> Reviewed-by: Matthew Auld  v1
> Cc: Matthew Auld 
> Cc: Chris Wilson 
> Cc: Zhenyu Wang 

Thanks for finding and quickly providing the fix, pushed.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx


[Intel-gfx] [PATCH v2] drm/i915: Fix the kernel panic when using aliasing ppgtt

2017-07-07 Thread Chuanxiao Dong
The ppgtt should be get directly from i915_address_space *vm instead of
vma->vm.

v2:
- add one more fix for bxt. (Chris)

Fixes: 4a234c5fae16 ("drm/i915: pass the vma to insert_entries")
Bugzilla:https://bugs.freedesktop.org/show_bug.cgi?id=101713
Signed-off-by: Chuanxiao Dong 
Reviewed-by: Matthew Auld  v1
Cc: Matthew Auld 
Cc: Chris Wilson 
Cc: Zhenyu Wang 
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c 
b/drivers/gpu/drm/i915/i915_gem_gtt.c
index de67084..10aa776 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -910,7 +910,7 @@ static void gen8_ppgtt_insert_3lvl(struct 
i915_address_space *vm,
   enum i915_cache_level cache_level,
   u32 unused)
 {
-   struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vma->vm);
+   struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);
struct sgt_dma iter = {
.sg = vma->pages->sgl,
.dma = sg_dma_address(iter.sg),
@@ -2242,7 +2242,7 @@ static void bxt_vtd_ggtt_insert_entries__BKL(struct 
i915_address_space *vm,
 enum i915_cache_level level,
 u32 unused)
 {
-   struct insert_entries arg = { vma->vm, vma, level };
+   struct insert_entries arg = { vm, vma, level };
 
stop_machine(bxt_vtd_ggtt_insert_entries__cb, , NULL);
 }
-- 
2.7.4

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