From 49a73adb610961e9700baa345a079834cf041c28 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 17 Nov 2011 09:10:02 +1000
Subject: [PATCH] --- yaml --- r: 276295 b: refs/heads/master c:
 26cfa81357b67229f71d25b53cbfbdfb83a38bdf h: refs/heads/master i:   276293:
 be75926270737f646e948a49115f1aeced082e5c   276291:
 3a3effd9f88afc62f7847d4e04d467f6e5d53ddb   276287:
 67b715b577bd6f1fdc1409192a66bf5d81bda642 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/nouveau/nvd0_display.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cc4ec6b5bcb4..e4f2cf1817cc 100644
--- 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
index 23d63b4b3d77..cb006a718e70 100644
--- 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;