[xsrc/trunk]: xsrc/external/mit/xf86-video-wsfb/dist/src Fix Xorg wsfb server...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/6ef9c5b67879
branches:  trunk
changeset: 10416:6ef9c5b67879
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Dec 25 14:36:34 2019 +0000

description:
Fix Xorg wsfb server "Rotate" corruption problem.  PR xsrc/54167

Confirmed on zaurus SL-C1000, SL-C3000 (CW) and hpcarm WS003SH (CCW).
Should be pulled up to netbsd-8 and netbsd-9.

diffstat:

 external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c |  34 ++++++++++++++++++--
 1 files changed, 30 insertions(+), 4 deletions(-)

diffs (71 lines):

diff -r 7d83c71a2ef3 -r 6ef9c5b67879 external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
--- a/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c       Wed Dec 18 19:37:40 2019 +0000
+++ b/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c       Wed Dec 25 14:36:34 2019 +0000
@@ -875,6 +875,7 @@
        int ret, flags, ncolors;
        int wsmode = WSDISPLAYIO_MODE_DUMBFB;
        int wstype;
+       int width;
        size_t len;
 
        TRACE_ENTER("WsfbScreenInit");
@@ -979,7 +980,17 @@
        fPtr->fbstart = fPtr->fbmem + fPtr->fbi.fbi_fboffset;
 
        if (fPtr->shadowFB) {
-               fPtr->shadow = calloc(1, fPtr->fbi.fbi_stride * pScrn->virtualY);
+               if (fPtr->rotate) {
+                       /*
+                        * Note Rotate and Shadow FB options are valid
+                        * only on depth >= 8.
+                        */
+                       len = pScrn->virtualX * pScrn->virtualY *
+                           (pScrn->bitsPerPixel >> 3);
+               } else {
+                       len = fPtr->fbi.fbi_stride * pScrn->virtualY;
+               }
+               fPtr->shadow = calloc(1, len);
 
                if (!fPtr->shadow) {
                        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -988,13 +999,29 @@
                }
        }
 
+       /*
+        * fbScreenInit() seems to require "pixel width of frame buffer"
+        * but it is actually "stride in pixel" of frame buffer,
+        * per xorg/xserver/tree/fb/fbscreen.c.
+        */
+       if (fPtr->rotate) {
+               width = pScrn->displayWidth;
+       } else {
+               if (pScrn->bitsPerPixel > 8) {
+                       width =
+                           fPtr->fbi.fbi_stride / (pScrn->bitsPerPixel >> 3);
+               } else {
+                       width =
+                           fPtr->fbi.fbi_stride * (8 / pScrn->bitsPerPixel);
+               }
+       }
        switch (pScrn->bitsPerPixel) {
        case 1:
                ret = fbScreenInit(pScreen,
                    fPtr->fbstart,
                    pScrn->virtualX, pScrn->virtualY,
                    pScrn->xDpi, pScrn->yDpi,
-                   fPtr->fbi.fbi_stride * 8, pScrn->bitsPerPixel);
+                   width, pScrn->bitsPerPixel);
                break;
        case 4:
        case 8:
@@ -1005,8 +1032,7 @@
                    fPtr->shadowFB ? fPtr->shadow : fPtr->fbstart,
                    pScrn->virtualX, pScrn->virtualY,
                    pScrn->xDpi, pScrn->yDpi,
-                   /* apparently fb wants stride in pixels, not bytes */
-                   fPtr->fbi.fbi_stride / (pScrn->bitsPerPixel >> 3),
+                   width,
                    pScrn->bitsPerPixel);
                break;
        default: