58 lines
1.2 KiB
Diff
58 lines
1.2 KiB
Diff
From 30449dfac037faebac42ddb4bf809e94412512cc 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(+)
|
|
|
|
diff --git src/mga_driver.c src/mga_driver.c
|
|
index 94183db..2aa0063 100644
|
|
--- src/mga_driver.c
|
|
+++ src/mga_driver.c
|
|
@@ -77,7 +77,9 @@
|
|
|
|
#include "xf86DDC.h"
|
|
|
|
+#if defined(__i386__) || defined(__x86_64__)
|
|
#include "vbe.h"
|
|
+#endif
|
|
|
|
#include "fb.h"
|
|
#include "dixstruct.h"
|
|
@@ -1378,6 +1380,7 @@ MGAdoDDC(ScrnInfoPtr pScrn)
|
|
pMga->ddc1Read ) ;
|
|
from = "DDC1";
|
|
}
|
|
+#if defined(__i386__) || defined(__x86_64__)
|
|
if (!MonInfo){
|
|
vbeInfoPtr pVbe;
|
|
if (xf86LoadSubModule(pScrn, "vbe")) {
|
|
@@ -1387,6 +1390,7 @@ MGAdoDDC(ScrnInfoPtr pScrn)
|
|
from = "VBE";
|
|
}
|
|
}
|
|
+#endif
|
|
}
|
|
|
|
if (MonInfo) {
|
|
@@ -1418,12 +1422,14 @@ MGAdoDDC(ScrnInfoPtr pScrn)
|
|
void
|
|
MGAProbeDDC(ScrnInfoPtr pScrn, int index)
|
|
{
|
|
+#if defined(__i386__) || defined(__x86_64__)
|
|
vbeInfoPtr pVbe;
|
|
if (xf86LoadSubModule(pScrn, "vbe")) {
|
|
pVbe = VBEInit(NULL,index);
|
|
ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
|
|
vbeFree(pVbe);
|
|
}
|
|
+#endif
|
|
}
|
|
|
|
Bool
|
|
--
|
|
2.30.1
|
|
|