Hi, Here's a handful of patches that try to replace most of our chipset feature checking with data in a new struct intel_chipset. It uses the new PCI ID list infrastructure and eliminates all IS_FOO macros in favor of a per-family chipset info struct. Actually, I was surprised how much in the driver is really just a gen check, but there are a few cases where we have to check a certain feature, as well as all the gen4+ urb and thread limits (includes the recent fix for swapped VS entry counts).
The series compiles and passes casual testing for me, but I've not run piglit on it yet. Kristian Kristian Høgsberg (16): intel: Use gen number instead of PCI ID in decoder intel: Use the PCI ID map for determining chipset gen intel: IS_9XX is just gen >= 3 intel: Remove unused IS_915 macro intel: Replace intel_screen::gen with the chipset struct intel: Add a is_945 bit to chipinfo and use that instead of IS_945 intel: Remove unused IS_MOBILE and IS_IGD* macros intel: Replace single use of IS_965 with gen check intel: Drop unused IS_GEN4 macro intel: Drop unused IS_GEN5-7 macros intel: Put urb and thread limits into the chipset struct intel: Drop unused IS_SNB/IVB_GT1/2 macros intel: Replace IS_G4X macro with an is_g4x bit in the chipset struct intel: Add is_855ish for handling 855 and 865 specific lod clamping intel: Get chipset name from PCI ID list intel: Remove intel_chipsets.h include/pci_ids/i915_pci_ids.h | 30 ++-- include/pci_ids/i965_pci_ids.h | 54 ++++---- include/pci_ids/pci_id_driver_map.h | 4 +- src/mesa/drivers/dri/i915/Makefile | 2 +- src/mesa/drivers/dri/i915/i830_texstate.c | 4 +- src/mesa/drivers/dri/i965/Makefile | 2 +- src/mesa/drivers/dri/i965/brw_context.c | 53 +------- src/mesa/drivers/dri/intel/intel_batchbuffer.c | 2 +- src/mesa/drivers/dri/intel/intel_chipset.h | 164 ------------------------ src/mesa/drivers/dri/intel/intel_context.c | 138 ++------------------ src/mesa/drivers/dri/intel/intel_decode.c | 43 +++--- src/mesa/drivers/dri/intel/intel_decode.h | 2 +- src/mesa/drivers/dri/intel/intel_extensions.c | 1 - src/mesa/drivers/dri/intel/intel_screen.c | 142 +++++++++++++++++---- src/mesa/drivers/dri/intel/intel_screen.h | 14 ++- 15 files changed, 221 insertions(+), 434 deletions(-) delete mode 100644 src/mesa/drivers/dri/intel/intel_chipset.h -- 1.7.4.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx