All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/nouveau: restore hw accelerated buffer copies
@ 2012-08-17 21:47 Marcin Slusarz
       [not found] ` <20120817214744.GA9955-OI9uyE9O0yo@public.gmane.org>
  0 siblings, 1 reply; 2+ messages in thread
From: Marcin Slusarz @ 2012-08-17 21:47 UTC (permalink / raw)
  To: Ben Skeggs; +Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] drm/nouveau: restore hw accelerated buffer copies
       [not found] ` <20120817214744.GA9955-OI9uyE9O0yo@public.gmane.org>
@ 2012-08-20  6:22   ` Ben Skeggs
  0 siblings, 0 replies; 2+ messages in thread
From: Ben Skeggs @ 2012-08-20  6:22 UTC (permalink / raw)
  To: Marcin Slusarz; +Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

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
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-08-20  6:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-17 21:47 [PATCH] drm/nouveau: restore hw accelerated buffer copies Marcin Slusarz
     [not found] ` <20120817214744.GA9955-OI9uyE9O0yo@public.gmane.org>
2012-08-20  6:22   ` Ben Skeggs

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.