Unfortunately, commit 989cf4f1fb2ac57f38d363734b71a5cf749db146 missed inserting a call to vgaHWSetStdFuncs prior to calling vgaHWGetIOBase for non-HiQ Video devices, so this will cause a crash with the X Server. The code has three different chipsPreInit* to handle some aspects of a PreInit callback, but only chipsPreInitHiQV function has the correct code. Added the call to vgaHWSetStdFuncs for chipsPreInit655xx and chipsPreInitWingine functions. This bug was observed on Chips & Technologies 65548.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com> --- src/ct_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ct_driver.c b/src/ct_driver.c index 6603e6b..b4b8422 100644 --- a/src/ct_driver.c +++ b/src/ct_driver.c @@ -2474,6 +2474,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags) return FALSE; hwp = VGAHWPTR(pScrn); + vgaHWSetStdFuncs(hwp); vgaHWGetIOBase(hwp); /* @@ -2940,6 +2941,7 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags) return FALSE; hwp = VGAHWPTR(pScrn); + vgaHWSetStdFuncs(hwp); vgaHWGetIOBase(hwp); /* -- 2.7.4 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel