---

yaml --- r: 205097 b: refs/heads/master c: d06ab84 h: refs/heads/master i: 205095: 1c346c9 v: v3
git-mirror · Jul 26, 2010 · d85aeb5 · d85aeb5
1 parent 9d0f8ad
commit d85aeb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d416d80f720f71e2dfe903d672bcca071822538
+refs/heads/master: d06ab841d14f3747823e88e5172047367e051a32
diff --git a/trunk/drivers/gpu/drm/nouveau/nv04_display.c b/trunk/drivers/gpu/drm/nouveau/nv04_display.c
@@ -81,8 +81,6 @@ nv04_display_store_initial_head_owner(struct drm_device *dev)
 	}
 
 ownerknown:
-	NV_INFO(dev, "Initial CRTC_OWNER is %d\n", dev_priv->crtc_owner);
-
 	/* we need to ensure the heads are not tied henceforth, or reading any
 	 * 8 bit reg on head B will fail
 	 * setting a single arbitrary head solves that */
@@ -244,11 +242,8 @@ nv04_display_restore(struct drm_device *dev)
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
 		crtc->funcs->restore(crtc);
 
-	if (nv_two_heads(dev)) {
-		NV_INFO(dev, "Restoring CRTC_OWNER to %d.\n",
-			dev_priv->crtc_owner);
+	if (nv_two_heads(dev))
 		NVSetOwner(dev, dev_priv->crtc_owner);
-	}
 
 	NVLockVgaCrtcs(dev, true);
 }