From d0d65940b4f4d4993eccb8c66ec7e8b633b331da Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 10 Jun 2011 19:51:12 +0100 Subject: [PATCH] sna: Remove the ability to disable chipset specific code This was a fun little, but pointless, exercise. Signed-off-by: Chris Wilson --- configure.ac | 38 ++-------------------------- src/intel_module.c | 60 ++------------------------------------------ src/sna/Makefile.am | 21 ---------------- src/sna/sna_render.h | 24 ------------------ 4 files changed, 4 insertions(+), 139 deletions(-) diff --git a/configure.ac b/configure.ac index 31106afc..5f193b37 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ AC_ARG_ENABLE(kms-only, AS_HELP_STRING([--enable-kms-only], AC_ARG_ENABLE(sna, AS_HELP_STRING([--enable-sna], - [Enable SandyBridge's New Acceleration (SNA) [options=default|gen2|gen3|ge4|gen5|gen6]]), + [Enable SandyBridge's New Acceleration (SNA) [default=no]]), [SNA="$enableval"], [SNA=no]) @@ -187,42 +187,8 @@ if test "x$VMAP" = xyes; then fi AM_CONDITIONAL(SNA, test x$SNA != xno) -AM_CONDITIONAL(SNA_GEN2, [echo $SNA | grep -E -qsi '(yes)|(all)|(gen2)']) -AM_CONDITIONAL(SNA_GEN3, [echo $SNA | grep -E -qsi '(yes)|(all)|(pnv)|(gen3)']) -AM_CONDITIONAL(SNA_GEN4, [echo $SNA | grep -E -qsi '(yes)|(all)|(brw)|(gen4)']) -AM_CONDITIONAL(SNA_GEN5, [echo $SNA | grep -E -qsi '(yes)|(all)|(ilk)|(gen5)']) -AM_CONDITIONAL(SNA_GEN6, [echo $SNA | grep -E -qsi '(yes)|(all)|(snb)|(gen6)']) AC_MSG_CHECKING([whether to include SNA support]) -sna_drivers="no" -if test "x$SNA" != xno; then - sna_drivers="" - AC_DEFINE(SNA,1,[Enable SandyBridge's New Architecture]) - if echo $SNA | grep -E -qsi '(yes)|(default)'; then - AC_DEFINE(SNA_DEFAULT,1,[Enable SandyBridge's New Architecture by default]) - sna_drivers="default $sna_drivers" - fi - if echo $SNA | grep -E -qsi '(yes)|(all)|(gen2)'; then - AC_DEFINE(SNA_GEN2,1,[Enable SandyBridge's New Architecture for GEN2]) - sna_drivers="i8xx $sna_drivers" - fi - if echo $SNA | grep -E -qsi '(yes)|(all)|(pnv)|(gen3)'; then - AC_DEFINE(SNA_GEN3,1,[Enable SandyBridge's New Architecture for PNV]) - sna_drivers="pnv $sna_drivers" - fi - if echo $SNA | grep -E -qsi '(yes)|(all)|(brw)|(gen4)'; then - AC_DEFINE(SNA_GEN4,1,[Enable SandyBridge's New Architecture for BRW]) - sna_drivers="brw $sna_drivers" - fi - if echo $SNA | grep -E -qsi '(yes)|(all)|(ilk)|(gen5)'; then - AC_DEFINE(SNA_GEN5,1,[Enable SandyBridge's New Architecture for ILK]) - sna_drivers="ilk $sna_drivers" - fi - if echo $SNA | grep -E -qsi '(yes)|(all)|(snb)|(gen6)'; then - AC_DEFINE(SNA_GEN6,1,[Enable SandyBridge's New Architecture for SNB]) - sna_drivers="snb $sna_drivers" - fi -fi -AC_MSG_RESULT([$sna_drivers]) +AC_MSG_RESULT([$SNA]) AM_CONDITIONAL(DEBUG, test x$DEBUG != xno) if test "x$DEBUG" = xno; then diff --git a/src/intel_module.c b/src/intel_module.c index bec3d0f1..63a63b8e 100644 --- a/src/intel_module.c +++ b/src/intel_module.c @@ -334,40 +334,8 @@ static Bool intel_pci_probe(DriverPtr driver, break; #endif -#if SNA - case 0: -#if SNA_GEN2 - case PCI_CHIP_I830_M: - case PCI_CHIP_845_G: - case PCI_CHIP_I854: - case PCI_CHIP_I855_GM: - case PCI_CHIP_I865_G: -#endif -#if SNA_GEN3 - case PCI_CHIP_PINEVIEW_M: - case PCI_CHIP_PINEVIEW_G: - case PCI_CHIP_G33_G: - case PCI_CHIP_Q35_G: - case PCI_CHIP_Q33_G: -#endif -#if SNA_GEN5 - case PCI_CHIP_IRONLAKE_D_G: - case PCI_CHIP_IRONLAKE_M_G: -#endif -#if SNA_GEN6 - case PCI_CHIP_SANDYBRIDGE_GT1: - case PCI_CHIP_SANDYBRIDGE_GT2: - case PCI_CHIP_SANDYBRIDGE_GT2_PLUS: - case PCI_CHIP_SANDYBRIDGE_M_GT1: - case PCI_CHIP_SANDYBRIDGE_M_GT2: - case PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS: - case PCI_CHIP_SANDYBRIDGE_S_GT: -#endif - sna_init_scrn(scrn, entity_num); - break; -#endif default: -#if SNA_DEFAULT +#if SNA sna_init_scrn(scrn, entity_num); #else intel_init_scrn(scrn); @@ -407,32 +375,8 @@ intel_available_options(int chipid, int busid) return lg_i810_available_options(chipid, busid); #endif -#if SNA - case 0: -#if SNA_GEN3 - case PCI_CHIP_PINEVIEW_M: - case PCI_CHIP_PINEVIEW_G: - case PCI_CHIP_G33_G: - case PCI_CHIP_Q35_G: - case PCI_CHIP_Q33_G: -#endif -#if SNA_GEN5 - case PCI_CHIP_IRONLAKE_D_G: - case PCI_CHIP_IRONLAKE_M_G: -#endif -#if SNA_GEN6 - case PCI_CHIP_SANDYBRIDGE_GT1: - case PCI_CHIP_SANDYBRIDGE_GT2: - case PCI_CHIP_SANDYBRIDGE_GT2_PLUS: - case PCI_CHIP_SANDYBRIDGE_M_GT1: - case PCI_CHIP_SANDYBRIDGE_M_GT2: - case PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS: - case PCI_CHIP_SANDYBRIDGE_S_GT: -#endif - return sna_available_options(chipid, busid); -#endif default: -#if SNA_DEFAULT +#if SNA return sna_available_options(chipid, busid); #else return intel_uxa_available_options(chipid, busid); diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am index f65b281b..24df843b 100644 --- a/src/sna/Makefile.am +++ b/src/sna/Makefile.am @@ -54,38 +54,17 @@ libsna_la_SOURCES = \ sna_video.h \ sna_video_overlay.c \ sna_video_textured.c \ - $(NULL) - -if SNA_GEN2 -libsna_la_SOURCES += \ gen2_render.c \ gen2_render.h \ - $(NULL) -endif -if SNA_GEN3 -libsna_la_SOURCES += \ gen3_render.c \ gen3_render.h \ - $(NULL) -endif -if SNA_GEN4 -libsna_la_SOURCES += \ gen4_render.c \ gen4_render.h \ - $(NULL) -endif -if SNA_GEN5 -libsna_la_SOURCES += \ gen5_render.c \ gen5_render.h \ - $(NULL) -endif -if SNA_GEN6 -libsna_la_SOURCES += \ gen6_render.c \ gen6_render.h \ $(NULL) -endif if DRI libsna_la_SOURCES += \ diff --git a/src/sna/sna_render.h b/src/sna/sna_render.h index 55ca5492..c2d6f12e 100644 --- a/src/sna/sna_render.h +++ b/src/sna/sna_render.h @@ -384,35 +384,11 @@ Bool sna_picture_is_solid(PicturePtr picture, uint32_t *color); void no_render_init(struct sna *sna); -#ifdef SNA_GEN2 Bool gen2_render_init(struct sna *sna); -#else -static inline Bool gen2_render_init(struct sna *sna) { return FALSE; } -#endif - -#ifdef SNA_GEN3 Bool gen3_render_init(struct sna *sna); -#else -static inline Bool gen3_render_init(struct sna *sna) { return FALSE; } -#endif - -#ifdef SNA_GEN4 Bool gen4_render_init(struct sna *sna); -#else -static inline Bool gen4_render_init(struct sna *sna) { return FALSE; } -#endif - -#ifdef SNA_GEN5 Bool gen5_render_init(struct sna *sna); -#else -static inline Bool gen5_render_init(struct sna *sna) { return FALSE; } -#endif - -#ifdef SNA_GEN6 Bool gen6_render_init(struct sna *sna); -#else -static inline Bool gen6_render_init(struct sna *sna) { return FALSE; } -#endif Bool sna_tiling_composite(struct sna *sna, uint32_t op,