summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-11-17 09:10:02 +1000
committerBen Skeggs <bskeggs@redhat.com>2011-11-30 23:40:30 +1000
commit26cfa81357b67229f71d25b53cbfbdfb83a38bdf (patch)
tree694346cfaa2e62f167a5483a7b9a26e1c5f8f96c
parentffe2dee49023c2a47ef7e177ceb22ec6bcaecc11 (diff)
downloadlinux-stable-26cfa81357b67229f71d25b53cbfbdfb83a38bdf.tar.gz
linux-stable-26cfa81357b67229f71d25b53cbfbdfb83a38bdf.tar.bz2
linux-stable-26cfa81357b67229f71d25b53cbfbdfb83a38bdf.zip
drm/nvd0/disp: fix sor dpms typo, preventing dpms on in some situations
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nvd0_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index 23d63b4b3d77..cb006a718e70 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;