xf86-video-mga: fix no-vbe patch for non-powerpc

This commit is contained in:
q66 2021-02-22 22:37:26 +01:00
parent 824bfb75b4
commit 59eb62114a

View file

@ -1,14 +1,15 @@
From 30449dfac037faebac42ddb4bf809e94412512cc Mon Sep 17 00:00:00 2001
From 9bbf539cee8b899c09454a433b8e6fca349400df Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <daniel@octaforge.org>
Date: Mon, 22 Feb 2021 21:08:26 +0100
Subject: [PATCH] only attempt to use VBE on x86
---
src/mga_driver.c | 6 ++++++
1 file changed, 6 insertions(+)
src/mga_driver.c | 10 ++++++++--
src/mga_merge.c | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git src/mga_driver.c src/mga_driver.c
index 94183db..2aa0063 100644
index 94183db..68f911f 100644
--- src/mga_driver.c
+++ src/mga_driver.c
@@ -77,7 +77,9 @@
@ -52,6 +53,37 @@ index 94183db..2aa0063 100644
}
Bool
@@ -1905,7 +1911,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Enabling KVM\n");
}
-#if !defined(__powerpc__)
+#if defined(__i386__) || defined(__x86_64__)
pMga->softbooted = FALSE;
Default = (pMga->chip_attribs->dual_head_possible
&& !pMga->Primary && !pMga->SecondCrtc);
@@ -2251,7 +2257,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
*/
(*pMga->PreInit)(pScrn);
-#if !defined(__powerpc__)
+#if defined(__i386__) || defined(__x86_64__)
/* Read and print the Monitor DDC info */
pScrn->monitor->DDC = MGAdoDDC(pScrn);
diff --git src/mga_merge.c src/mga_merge.c
index 64c85b4..62a6330 100644
--- src/mga_merge.c
+++ src/mga_merge.c
@@ -406,7 +406,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
*/
(*pMga->PreInit)(pScrn);
-#if !defined(__powerpc__)
+#if defined(__i386__) || defined(__x86_64__)
/* Read and print the Monitor DDC info */
/* pScrn->monitor->DDC = MGAdoDDC(pScrn);*/ /*FIXME: have to try this*/
--
2.30.1