Commit c6fdaad9 authored by Adam Jackson's avatar Adam Jackson 🦃

Don't build old probe method on sufficiently new servers

If we have pciaccess and not ISA support VESAProbe is effectively return
FALSE, and the server will issue a potentially confusing fallback
message if VESAPciProbe failed and ->Probe is non-NULL.
Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
parent b9f9c95c
......@@ -66,7 +66,11 @@
/* Mandatory functions */
static const OptionInfoRec * VESAAvailableOptions(int chipid, int busid);
static void VESAIdentify(int flags);
#if defined(XSERVER_LIBPCIACCESS) && !defined(HAVE_ISA)
#define VESAProbe NULL
#else
static Bool VESAProbe(DriverPtr drv, int flags);
#endif
#ifdef XSERVER_LIBPCIACCESS
static Bool VESAPciProbe(DriverPtr drv, int entity_num,
struct pci_device *dev, intptr_t match_data);
......@@ -466,6 +470,7 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
}
#endif
#ifndef VESAProbe
static Bool
VESAProbe(DriverPtr drv, int flags)
{
......@@ -536,6 +541,7 @@ VESAProbe(DriverPtr drv, int flags)
return (foundScreen);
}
#endif
#ifdef HAVE_ISA
static int
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment