summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2008-10-30 13:40:23 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-10-30 13:40:23 -0700
commit7e68786cf746b6b984b184080578db1947b268ed (patch)
tree54d61d4ca8ad93f05fb57bd9e14233f191d091d5
parent87ea531c5dc5b39809395b277c330854aaaaf019 (diff)
downloadxf86-video-intel-frc-7e68786cf746b6b984b184080578db1947b268ed.tar.gz
xf86-video-intel-frc-7e68786cf746b6b984b184080578db1947b268ed.tar.bz2
Don't modify render standby if kernel mode setting is active
Since we can't bang on registers directly in that case.
-rw-r--r--src/i830_driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 25bcb475..4ffcd5f1 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3313,7 +3313,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
return FALSE;
}
- i830_disable_render_standby(pScrn);
+ if (!pI830->use_drm_mode)
+ i830_disable_render_standby(pScrn);
DPRINTF(PFX, "assert( if(!I830EnterVT(scrnIndex, 0)) )\n");