[PATCH] drm/nouveau: restore hw accelerated buffer copies

[PATCH] drm/nouveau: restore hw accelerated buffer copies

[Marcin Slusarz]

Regression from "drm/nve0: use async copy engine for ttm buffer moves
if available".

Signed-off-by: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/gpu/drm/nouveau/nouveau_bo.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 325b8cb..dc04395 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1037,9 +1037,9 @@ nouveau_bo_move_init(struct nouveau_drm *drm)
 		u32 handle = (mthd->engine << 16) | mthd->oclass;
 
 		if (mthd->init == nve0_bo_move_init)
-			chan = drm->channel;
-		else
 			chan = drm->cechan;
+		else
+			chan = drm->channel;
 		if (chan == NULL)
 			continue;
 
-- 
1.7.8.6

Re: [PATCH] drm/nouveau: restore hw accelerated buffer copies

[Ben Skeggs]

On Fri, Aug 17, 2012 at 11:47:44PM +0200, Marcin Slusarz wrote:
> Regression from "drm/nve0: use async copy engine for ttm buffer moves
> if available".
Oops, my bad.  Applied, thanks!

> 
> Signed-off-by: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  drivers/gpu/drm/nouveau/nouveau_bo.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index 325b8cb..dc04395 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -1037,9 +1037,9 @@ nouveau_bo_move_init(struct nouveau_drm *drm)
>  		u32 handle = (mthd->engine << 16) | mthd->oclass;
>  
>  		if (mthd->init == nve0_bo_move_init)
> -			chan = drm->channel;
> -		else
>  			chan = drm->cechan;
> +		else
> +			chan = drm->channel;
>  		if (chan == NULL)
>  			continue;
>  
> -- 
> 1.7.8.6
>