---

yaml --- r: 276295 b: refs/heads/master c: 26cfa81 h: refs/heads/master i: 276293: be75926 276291: 3a3effd 276287: 67b715b v: v3
git-mirror · Nov 30, 2011 · 49a73ad · 49a73ad
1 parent b863f9f
commit 49a73ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffe2dee49023c2a47ef7e177ceb22ec6bcaecc11
+refs/heads/master: 26cfa81357b67229f71d25b53cbfbdfb83a38bdf
diff --git a/trunk/drivers/gpu/drm/nouveau/nvd0_display.c b/trunk/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -780,7 +780,7 @@ nvd0_sor_dpms(struct drm_encoder *encoder, int mode)
 			continue;
 
 		if (nv_partner != nv_encoder &&
-		    nv_partner->dcb->or == nv_encoder->or) {
+		    nv_partner->dcb->or == nv_encoder->dcb->or) {
 			if (nv_partner->last_dpms == DRM_MODE_DPMS_ON)
 				return;
 			break;