summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2002-12-12 18:29:05 +0000
committerEgbert Eich <eich@suse.de>2002-12-12 18:29:05 +0000
commit870d0f8752c11c3df42185786ab1e2bd200e4de1 (patch)
tree34890b5ac5d4017a0050651574f35b30ed64a2bc
parent7827fce0b5ff600d0adc3a30eab69e8141c2e548 (diff)
621. Let kbd driver test if Xserver is in suspend before handling any inputxf-4_3_99_2xf-4_3_99_1xf-4_3_0_1xf-4_3_0xf-4_2_99_902xf-4_2_99_901xf-4_2_99_4xf-4_2_99_3
events (Egbert Eich). 620. Fixed agp version checking to accept minor versions >= the specified number (Leif Delgass).
-rw-r--r--hw/kdrive/linux/agp.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c
index c27e1b0af..dc31eac96 100644
--- a/hw/kdrive/linux/agp.c
+++ b/hw/kdrive/linux/agp.c
@@ -120,9 +120,16 @@ GARTInit()
KdReleaseGART(-1);
#if defined(linux)
- /* Should this look for version >= rather than version == ? */
- if (agpinf.version.major != AGPGART_MAJOR_VERSION &&
- agpinf.version.minor != AGPGART_MINOR_VERSION) {
+ /* Per Dave Jones, every effort will be made to keep the
+ * agpgart interface backwards compatible, so allow all
+ * future versions.
+ */
+ if (
+#if (AGPGART_MAJOR_VERSION > 0) /* quiet compiler */
+ agpinf.version.major < AGPGART_MAJOR_VERSION ||
+#endif
+ (agpinf.version.major == AGPGART_MAJOR_VERSION &&
+ agpinf.version.minor < AGPGART_MINOR_VERSION)) {
fprintf(stderr,
"Kernel agpgart driver version is not current"
" (%d.%d vs %d.%d)\n",