diff options
Diffstat (limited to 'src/intel_driver.h')
| -rw-r--r-- | src/intel_driver.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/intel_driver.h b/src/intel_driver.h index f33d1352..31c11f68 100644 --- a/src/intel_driver.h +++ b/src/intel_driver.h @@ -209,7 +209,7 @@ #define SUBSYS_ID(p) (p)->subdevice_id #define CHIP_REVISION(p) (p)->revision -#define INTEL_INFO(intel) ((intel)->chipset.info) +#define INTEL_INFO(intel) ((intel)->info) #define IS_GENx(intel, X) (INTEL_INFO(intel)->gen >= 10*(X) && INTEL_INFO(intel)->gen < 10*((X)+1)) #define IS_GEN1(intel) IS_GENx(intel, 1) #define IS_GEN2(intel) IS_GENx(intel, 2) @@ -234,18 +234,13 @@ #define HAS_BLT(pI810) (INTEL_INFO(intel)->gen >= 60) extern SymTabRec *intel_chipsets; - -struct intel_chipset { - const char *name; - int variant; - const struct intel_device_info { - int gen; - } *info; +struct intel_device_info { + int gen; }; -void intel_detect_chipset(ScrnInfoPtr scrn, - struct pci_device *pci, - struct intel_chipset *chipset); +const struct intel_device_info * +intel_detect_chipset(ScrnInfoPtr scrn, + EntityInfoPtr ent, struct pci_device *pci); #endif /* INTEL_DRIVER_H */ |