Nouveau - Feb 2012 - [PATCH] drm/nv50/vm: Prevent kernel freeze

Commit 'drm/nv50-nvc0/vm: support unsnooped system memory' caused
a regression on certain nv50 IGP due to not passing the correct
target type to nv50_vm_addr()

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=45746
Reported-by: Johannes Obermayr <johannesobermayr at gmx.de>
Tested-by: Johannes Obermayr <johannesobermayr at gmx.de>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 drivers/gpu/drm/nouveau/nv50_vm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nv50_vm.c
b/drivers/gpu/drm/nouveau/nv50_vm.c
index f06f4ad..44fbac9 100644
--- a/drivers/gpu/drm/nouveau/nv50_vm.c
+++ b/drivers/gpu/drm/nouveau/nv50_vm.c
@@ -85,7 +85,7 @@ nv50_vm_map(struct nouveau_vma *vma, struct nouveau_gpuobj
*pgt,
 		target = 3;
 	}
 
-	phys  = vm_addr(vma, phys, mem->memtype, 0);
+	phys  = vm_addr(vma, phys, mem->memtype, target);
 	pte <<= 3;
 	cnt <<= 3;
 
-- 
1.7.9.2

On Mon, 2012-02-27 at 21:01 +0000, Emil Velikov wrote:
> Commit 'drm/nv50-nvc0/vm: support unsnooped system memory' caused
> a regression on certain nv50 IGP due to not passing the correct
> target type to nv50_vm_addr()
Thanks for this, I've pushed it to the nouveau tree.

Ben.
> 
> Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=45746
> Reported-by: Johannes Obermayr <johannesobermayr at gmx.de>
> Tested-by: Johannes Obermayr <johannesobermayr at gmx.de>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  drivers/gpu/drm/nouveau/nv50_vm.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nv50_vm.c
b/drivers/gpu/drm/nouveau/nv50_vm.c
> index f06f4ad..44fbac9 100644
> --- a/drivers/gpu/drm/nouveau/nv50_vm.c
> +++ b/drivers/gpu/drm/nouveau/nv50_vm.c
> @@ -85,7 +85,7 @@ nv50_vm_map(struct nouveau_vma *vma, struct
nouveau_gpuobj *pgt,
>  		target = 3;
>  	}
>  
> -	phys  = vm_addr(vma, phys, mem->memtype, 0);
> +	phys  = vm_addr(vma, phys, mem->memtype, target);
>  	pte <<= 3;
>  	cnt <<= 3;
>