Skip to contentSkip to conversation

drm/nouveau: restore hw accelerated buffer copies

PATCH In review Marcin Slusarz 2 participants 2 messages Aug 17, 2012 – Aug 20, 2012 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/nouveau: restore hw accelerated buffer copies

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

---
 drivers/gpu/drm/nouveau/nouveau_bo.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +2 -2
index 325b8cb..dc04395 100644
@@ -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;
 
Signature · 1 line
1.7.8.6

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw
Quoted 2 lines · Marcin Slusarz

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

Oops, my bad. Applied, thanks!

Quoted 25 lines
---
 drivers/gpu/drm/nouveau/nouveau_bo.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +2 -2
index 325b8cb..dc04395 100644
@@ -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;
 
Signature · 1 line
1.7.8.6