xorg-server: Changes to 'debian-unstable'
debian/changelog | 4 ++++
hw/xfree86/common/xf86Helper.c | 5 -----
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit f03646c4074409ca98406ec0c71e47407971ab8c
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Nov 7 21:04:24 2008 +0100
update changelog
diff --git a/debian/changelog b/debian/changelog
index 53babc4..8186d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ xorg-server (2:1.4.2-8) UNRELEASED; urgency=low
* Add patch from Petr Salinger to fix PCI domain support on kfreebsd
(closes: #499501).
+ * xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags.
+ Instead of forcing a 32bpp framebuffer, we pick a value that the driver
+ actually supports (closes: #504819, #486925); cherry-picked from upstream
+ git.
-- Julien Cristau <jcristau@debian.org> Mon, 06 Oct 2008 18:37:08 +0200
commit f6d8e366f8b922f7e711f4c29b5ea11ec4f8b342
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Nov 7 17:36:38 2008 +0100
xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags
When setting the depth to 24, leave bpp unset so the logic to pick
a supported value is used instead of ignoring the driver's preference
and forcing 32 bpp.
(cherry picked from commit 991c88b7542164194be73573e7644164416ea90c)
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 7adac73..b6e0787 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -466,10 +466,6 @@ xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad)
#define GLOBAL_DEFAULT_DEPTH 24
#endif
-#ifndef GLOBAL_DEFAULT_FBBPP
-#define GLOBAL_DEFAULT_FBBPP 32
-#endif
-
_X_EXPORT Bool
xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
int depth24flags)
@@ -547,7 +543,6 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
if (depth > 0)
scrp->depth = depth;
} else {
- scrp->bitsPerPixel = GLOBAL_DEFAULT_FBBPP;
scrp->depth = GLOBAL_DEFAULT_DEPTH;
}
}
Reply to: