xserver-xorg-video-cirrus: Changes to 'debian-unstable'
debian/changelog | 14 ++++++++++
debian/control | 1
debian/patches/10-qemu.diff | 28 +++++++++++++++++++++
debian/patches/20-faumachine-maxpitch.diff | 38 +++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/rules | 2 -
6 files changed, 84 insertions(+), 1 deletion(-)
New commits:
commit 1077f170043bc92d868141490a5f539b18ac67b8
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jan 12 03:52:18 2011 +0100
Upload to unstable, fixing version.
There's already 1:1.3.2-3 in experimental.
diff --git a/debian/changelog b/debian/changelog
index b1ca8d0..60990e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.3.2-3) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.2-2+squeeze1) unstable; urgency=low
* Add 10-qemu.diff, stolen from Fedora, making the driver default to
1024x768 instead of 800x600 for the device simulated by QEMU. Thanks
@@ -10,7 +10,7 @@ xserver-xorg-video-cirrus (1:1.3.2-3) UNRELEASED; urgency=low
* Add 20-faumachine-maxpitch.diff, stolen from Ubuntu, fixing pitch
issues with GD5446, which is the device simulated by FAUmachine.
- -- Cyril Brulebois <kibi@debian.org> Wed, 12 Jan 2011 03:15:54 +0100
+ -- Cyril Brulebois <kibi@debian.org> Wed, 12 Jan 2011 03:51:33 +0100
xserver-xorg-video-cirrus (1:1.3.2-2) unstable; urgency=low
commit b98e49e8112bdff64d1308851d587f2b757dbc65
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jan 12 03:44:57 2011 +0100
Clarify that the default resolution change targets QEMU's device.
diff --git a/debian/changelog b/debian/changelog
index 89912fa..b1ca8d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-cirrus (1:1.3.2-3) UNRELEASED; urgency=low
* Add 10-qemu.diff, stolen from Fedora, making the driver default to
- 1024x768 instead of 800x600. Thanks to Guido Günther for the pointer
- to that pretty ugly hack (Closes: #586693).
+ 1024x768 instead of 800x600 for the device simulated by QEMU. Thanks
+ to Guido Günther for the pointer to that pretty ugly yet useful hack
+ (Closes: #586693).
* Add a dependency from configure to $(STAMP_DIR)/patch to get patches
applied.
* Add quilt build-dep accordingly.
commit c42559c446d1ac9a0e16ce52579ac5b07c893d54
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jan 12 03:40:41 2011 +0100
Add 20-faumachine-maxpitch.diff, stolen from Ubuntu.
This fixes pitch issues with GD5446, which is the device simulated by
FAUmachine.
diff --git a/debian/changelog b/debian/changelog
index 26f9d47..89912fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xserver-xorg-video-cirrus (1:1.3.2-3) UNRELEASED; urgency=low
* Add a dependency from configure to $(STAMP_DIR)/patch to get patches
applied.
* Add quilt build-dep accordingly.
+ * Add 20-faumachine-maxpitch.diff, stolen from Ubuntu, fixing pitch
+ issues with GD5446, which is the device simulated by FAUmachine.
-- Cyril Brulebois <kibi@debian.org> Wed, 12 Jan 2011 03:15:54 +0100
diff --git a/debian/patches/20-faumachine-maxpitch.diff b/debian/patches/20-faumachine-maxpitch.diff
new file mode 100644
index 0000000..dd0ea32
--- /dev/null
+++ b/debian/patches/20-faumachine-maxpitch.diff
@@ -0,0 +1,38 @@
+Fix max pitch issues in FAUmachine.
+
+Patch by Stefan Potyra <sistpoty@ubuntu.com>, stolen from bugzilla:
+https://bugs.freedesktop.org/show_bug.cgi?id=23775
+
+--- a/src/alp_driver.c
++++ b/src/alp_driver.c
+@@ -407,6 +407,8 @@ GetAccelPitchValues(ScrnInfoPtr pScrn)
+ {
+ int *linePitches = NULL;
+ int i, n = 0;
++ int max_pitch = 2048;
++
+ CirPtr pCir = CIRPTR(pScrn);
+
+ /* XXX ajv - 512, 576, and 1536 may not be supported
+@@ -423,8 +425,20 @@ GetAccelPitchValues(ScrnInfoPtr pScrn)
+ 1280, 1536, 1600, 1920, 2048, 0 };
+ #endif
+
++ switch (pCir->Chipset) {
++ case PCI_CHIP_GD5446:
++ max_pitch = 0x1ff << 3;
++ break;
++
++ default:
++ /* FIXME max_pitch for other chipsets? */
++ max_pitch = (pScrn->bitsPerPixel / 8) * 2048;
++ break;
++ }
++
+ for (i = 0; accelWidths[i] != 0; i++) {
+- if (accelWidths[i] % pCir->Rounding == 0) {
++ if ((accelWidths[i] % pCir->Rounding == 0)
++ && ((accelWidths[i] * pScrn->bitsPerPixel / 8) <= max_pitch)) {
+ n++;
+ linePitches = xnfrealloc(linePitches, n * sizeof(int));
+ linePitches[n - 1] = accelWidths[i];
diff --git a/debian/patches/series b/debian/patches/series
index 354eb33..e99ced6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
10-qemu.diff
+20-faumachine-maxpitch.diff
commit 969be611c71a891f8c52b56ec92871e614ea3768
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jan 12 03:29:45 2011 +0100
Get patches applied.
diff --git a/debian/changelog b/debian/changelog
index 4818990..26f9d47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ xserver-xorg-video-cirrus (1:1.3.2-3) UNRELEASED; urgency=low
* Add 10-qemu.diff, stolen from Fedora, making the driver default to
1024x768 instead of 800x600. Thanks to Guido Günther for the pointer
to that pretty ugly hack (Closes: #586693).
+ * Add a dependency from configure to $(STAMP_DIR)/patch to get patches
+ applied.
+ * Add quilt build-dep accordingly.
-- Cyril Brulebois <kibi@debian.org> Wed, 12 Jan 2011 03:15:54 +0100
diff --git a/debian/control b/debian/control
index 9fdbbbe..ef6254a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5),
+ quilt,
pkg-config,
xserver-xorg-dev (>= 2:1.7.6.901),
x11proto-video-dev,
diff --git a/debian/rules b/debian/rules
index 7f11fd0..e3127e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-configure:
+configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
commit d92e1247cdb5084755f749e7b7319a140a32b464
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jan 12 03:19:31 2011 +0100
Add 10-qemu.diff, stolen from Fedora.
This makes the driver default to 1024x768 instead of 800x600. Thanks to
Guido Günther for the pointer to that pretty ugly hack (Closes: #586693).
diff --git a/debian/changelog b/debian/changelog
index 2e70cbb..4818990 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-cirrus (1:1.3.2-3) UNRELEASED; urgency=low
+
+ * Add 10-qemu.diff, stolen from Fedora, making the driver default to
+ 1024x768 instead of 800x600. Thanks to Guido Günther for the pointer
+ to that pretty ugly hack (Closes: #586693).
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 12 Jan 2011 03:15:54 +0100
+
xserver-xorg-video-cirrus (1:1.3.2-2) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/10-qemu.diff b/debian/patches/10-qemu.diff
new file mode 100644
index 0000000..4a5532d
--- /dev/null
+++ b/debian/patches/10-qemu.diff
@@ -0,0 +1,28 @@
+Default to 1024x768 for Qemu.
+
+Stolen from Fedora.
+
+Pointed out by Guido Günther <agx@sigxcpu.org> in #586693.
+--- a/src/alp_driver.c
++++ b/src/alp_driver.c
+@@ -734,6 +734,20 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+ else
+ xf86SetDDCproperties(pScrn,xf86PrintEDID(
+ xf86DoEDID_DDC2(pScrn->scrnIndex,pCir->I2CPtr1)));
++#ifdef XSERVER_LIBPCIACCESS
++ if (!pScrn->monitor->DDC &&
++ ((pCir->PciInfo->subvendor_id & 0xffff) == 0x1af4)) {
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++ "Defaulting to 1024x768 for QEMU\n");
++ pScrn->monitor->nHsync = 1;
++ pScrn->monitor->hsync[0].lo = 31.5;
++ pScrn->monitor->hsync[0].hi = 48.0;
++ pScrn->monitor->nVrefresh = 1;
++ pScrn->monitor->vrefresh[0].lo = 56.0;
++ pScrn->monitor->vrefresh[0].hi = 60.1;
++ pScrn->monitor->maxPixClock = 65000;
++ }
++#endif
+
+ /* Probe the possible LCD display */
+ AlpProbeLCD(pScrn);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..354eb33
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-qemu.diff
Reply to: