← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xserver-xorg-video-intel/jaunty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/121_i965_default_virtual_to_2048_2048.patch

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington
  • Date: 2009-05-04 15:11:33 UTC
  • Revision ID: james.westby@ubuntu.com-20090504151133-oe7gnfjc27qaaf3i
Tags: 2:2.6.3-0ubuntu9.2
https://launchpad.net/bugs/370777
https://launchpad.net/bugs/371544
Update 121_i965_default_to_virtual_2048_2048.patch to check more
thoroughly for user-supplied Virtual settings.  (Thanks kedazo)
(LP: #370777, #371544)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/121_i965_default_virtual_to_2048_2048.patch
1
 
diff -Nurp xserver-xorg-video-intel-2.6.3/src/i830_driver.c working~virtual/src/i830_driver.c
2
 
--- xserver-xorg-video-intel-2.6.3/src/i830_driver.c    2009-03-02 11:21:07.000000000 -0800
3
 
+++ working~virtual/src/i830_driver.c   2009-04-29 14:21:54.000000000 -0700
4
 
@@ -1979,6 +1979,15 @@ I830PreInit(ScrnInfoPtr pScrn, int flags
 
1
diff -Nurp patched/src/i830_driver.c working/src/i830_driver.c
 
2
--- patched/src/i830_driver.c   2009-05-04 14:04:00.000000000 -0700
 
3
+++ working/src/i830_driver.c   2009-05-04 14:05:34.000000000 -0700
 
4
@@ -1953,6 +1953,16 @@ I830PreInit(ScrnInfoPtr pScrn, int flags
5
5
        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
6
6
                  "VBIOS initialization failed.\n");
7
7
 
8
 
+   if (IS_I965G(pI830) && pScrn->virtualX == 0 && pScrn->virtualY == 0) {
 
8
+   if (IS_I965G(pI830) && pScrn->virtualX == 0 && pScrn->virtualY == 0
 
9
+       && pScrn->display->virtualX == 0 && pScrn->display->virtualY == 0) {
9
10
+       xf86DrvMsg(pScrn->scrnIndex, X_INFO,
10
11
+                 "Defaulting Virtual to 2048 2048 for i965.\n");
11
12
+       pScrn->virtualX = 2048;