---

yaml --- r: 218215 b: refs/heads/master c: 5220b3c h: refs/heads/master i: 218213: 859f9d0 218211: 0a04e8b 218207: af2ea05 v: v3
git-mirror · Sep 24, 2010 · 08b9016 · 08b9016
1 parent 45e8af5
commit 08b9016
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f7d42ece30104dd05307f0a004c9d45895582fb
+refs/heads/master: 5220b3c14b5d4e35df5a4574534519d7007713c3
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -529,8 +529,8 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
 	while (length) {
 		u32 amount, stride, height;
 
-		amount  = min(length, (u64)(16 * 1024 * 1024));
-		stride  = 64 * 4;
+		amount  = min(length, (u64)(4 * 1024 * 1024));
+		stride  = 16 * 4;
 		height  = amount / stride;
 
 		if (new_mem->mem_type == TTM_PL_VRAM && nvbo->tile_flags) {
@@ -540,7 +540,7 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
 
 			BEGIN_RING(chan, NvSubM2MF, 0x0200, 7);
 			OUT_RING  (chan, 0);
-			OUT_RING  (chan, 0x20);
+			OUT_RING  (chan, 0);
 			OUT_RING  (chan, stride);
 			OUT_RING  (chan, height);
 			OUT_RING  (chan, 1);
@@ -561,7 +561,7 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
 
 			BEGIN_RING(chan, NvSubM2MF, 0x021c, 7);
 			OUT_RING  (chan, 0);
-			OUT_RING  (chan, 0x20);
+			OUT_RING  (chan, 0);
 			OUT_RING  (chan, stride);
 			OUT_RING  (chan, height);
 			OUT_RING  (chan, 1);