diff options
| author | Kevin Brace <kevinbrace@gmx.com> | 2019-02-12 15:47:07 -0800 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@gmx.com> | 2019-02-12 15:47:07 -0800 |
| commit | c5e70111d648777afd1de501214d875cf838fde7 (patch) | |
| tree | 77704c33af0f1c6d76987296810e226b7de1d0ee | |
| parent | 18c04e66a1018a37c3fe9ff9e074a1837659eca3 (diff) | |
Fix for a faulty new vgaHW ABI conversion on non-HiQ Video devices
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 <kevinbrace@gmx.com>
| -rw-r--r-- | src/ct_driver.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); /* |