From 870d0f8752c11c3df42185786ab1e2bd200e4de1 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 12 Dec 2002 18:29:05 +0000 Subject: [PATCH] 621. Let kbd driver test if Xserver is in suspend before handling any input events (Egbert Eich). 620. Fixed agp version checking to accept minor versions >= the specified number (Leif Delgass). --- hw/kdrive/linux/agp.c | 13 ++++++++++--- 1 file 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",