diff options
| author | Adam Jackson <ajax@redhat.com> | 2018-01-31 10:48:06 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-02-15 14:27:24 -0500 |
| commit | c6fdaad9649d3fb6a13a8180c17ea8181aabd375 (patch) | |
| tree | 4eff8bca9001adc5cdc9dd444ce833a5a952c71d | |
| parent | b9f9c95ca2383460aa283adeeee6e0a66eed722b (diff) | |
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 <ajax@redhat.com>
| -rw-r--r-- | src/vesa.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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 |