From bfe5a1349930a854e232b971459de3d65bab8fef Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 7 Nov 2008 17:36:38 +0100 Subject: [PATCH] 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) --- hw/xfree86/common/xf86Helper.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 282eb49f9..d72a359e1 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -448,10 +448,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) @@ -529,7 +525,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; } }