mirror of
https://github.com/X11Libre/xf86-video-chips.git
synced 2026-03-24 01:24:44 +00:00
Fix for a faulty new vgaHW ABI conversion on non-HiQ Video devices
Unfortunately, commit 989cf4f1fb
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>
This commit is contained in:
@@ -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);
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user