From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 16 Nov 2011 23:10:02 +0000 (+1000)
Subject: drm/nvd0/disp: fix sor dpms typo, preventing dpms on in some situations
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=26cfa81357b67229f71d25b53cbfbdfb83a38bdf;p=mv-sheeva.git

drm/nvd0/disp: fix sor dpms typo, preventing dpms on in some situations

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index 23d63b4b3d7..cb006a718e7 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/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;