summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2011-12-19 17:47:38 -0500
committerAdam Jackson <ajax@redhat.com>2011-12-19 17:47:38 -0500
commit515d232162c8ea2c5ecabf12b88b0bf4eb5102e7 (patch)
tree8ea3386a91bb358b386a4f36d7f6dd79f06e0604
parent78052e0d3e28c7e6e08666d9ed2bcc64f5e93540 (diff)
Fix for new vgaHW ABI
Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--src/gx_driver.c2
-rw-r--r--src/lx_driver.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gx_driver.c b/src/gx_driver.c
index 47c20d2..b9904d1 100644
--- a/src/gx_driver.c
+++ b/src/gx_driver.c
@@ -445,6 +445,8 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
if (pGeode->useVGA) {
if (!xf86LoadSubModule(pScrni, "vgahw") || !vgaHWGetHWRec(pScrni))
pGeode->useVGA = FALSE;
+ else
+ vgaHWSetStdFuncs(VGAHWPTR(pScrni));
#if INT10_SUPPORT
pGeode->vesa = calloc(1, sizeof(VESARec));
diff --git a/src/lx_driver.c b/src/lx_driver.c
index a17854c..146d7c3 100644
--- a/src/lx_driver.c
+++ b/src/lx_driver.c
@@ -312,6 +312,8 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
if (pGeode->useVGA) {
if (!xf86LoadSubModule(pScrni, "vgahw") || !vgaHWGetHWRec(pScrni))
pGeode->useVGA = FALSE;
+ else
+ vgaHWSetStdFuncs(VGAHWPTR(pScrni));
pGeode->vesa = calloc(1, sizeof(VESARec));
}