diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-08-19 15:57:22 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-08-21 20:10:41 -0500 |
| commit | fe5018e0564118a7a8198fa286186fdb9ed818c7 (patch) | |
| tree | d0434f0dcea1d5949513c6c3e8a6b0b24010dbf6 | |
| parent | 5d133276de9c50146e80ffc69edd429c2afe98e6 (diff) | |
fb: Fix invalid bpp for 24bit depth window
We have a hack in fb layer for a 24bpp screen to use 32bpp images, and
fbCreateWindow() replaces its drawable.bitsPerPixel field
appropriately. But, the problem is that it always replaces when 32bpp
is passed. If the depth is 32, this results in bpp < depth, which is
actually invalid.
Meanwhile, fbCreatePixmap() has a more check and it creates with 24bpp
only when the passed depth <= 24 for avoiding such a problem.
This oneliner patch just adds the similar check in fbCreateWindow().
This (hopefully) fixes the long-standing broken graphics mess of
cirrus KMS with 24bpp.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | fb/fbwindow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 368c4b883..c90175faa 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -33,7 +33,7 @@ fbCreateWindow(WindowPtr pWin) { dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(pWin), fbGetScreenPixmap(pWin->drawable.pScreen)); - if (pWin->drawable.bitsPerPixel == 32) + if (pWin->drawable.bitsPerPixel == 32 && pWin->drawable.depth <= 24) pWin->drawable.bitsPerPixel = fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp; return TRUE; |