Module Name:    xsrc
Committed By:   macallan
Date:           Sun Jul 22 14:54:32 UTC 2018

Modified Files:
        xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c

Log Message:
actually use wsdisplayio_fbinfo::fbi_fboffset


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 \
    xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.29 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.30
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.29	Fri Mar 24 00:57:33 2017
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c	Sun Jul 22 14:54:32 2018
@@ -501,8 +501,10 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
 		}
 		fbi->fbi_flags = 0;
 		fbi->fbi_fbsize = lb * info.height;
+		fbi->fbi_fboffset = 0;
 
 	}
+	xf86Msg(X_INFO, "fboffset %x\n", fPtr->fbi.fbi_fboffset);
 	/*
 	 * Allocate room for saving the colormap.
 	 */
@@ -958,7 +960,7 @@ WsfbScreenInit(SCREEN_INIT_ARGS_DECL)
 		pScrn->PointerMoved = WsfbPointerMoved;
 	}
 
-	fPtr->fbstart = fPtr->fbmem;
+	fPtr->fbstart = fPtr->fbmem + fPtr->fbi.fbi_fboffset;
 #ifdef	WSDISPLAY_TYPE_LUNA
 	if (wstype == WSDISPLAY_TYPE_LUNA) {
 		/*

Reply via email to