On Mon, Mar 1, 2010 at 5:52 AM, Dave Airlie <airl...@gmail.com> wrote:
> From: Dave Airlie <airl...@ppcg5.localdomain>
>
> radeon was always including the atpx code unnecessarily, also core
> switcheroo was including acpi headers.
>
> Signed-off-by: Dave Airlie <airl...@redhat.com>
> ---
> drivers/gpu/drm/radeon/Makefile | 3 ++-
> drivers/gpu/drm/radeon/radeon_atpx_handler.c | 1 -
> drivers/gpu/drm/radeon/radeon_drv.h | 6 ++++++
> drivers/gpu/vga/vga_switcheroo.c | 3 ---
> include/linux/vga_switcheroo.h | 1 -
> 5 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
> index 0a4d526..0adf49e 100644
> --- a/drivers/gpu/drm/radeon/Makefile
> +++ b/drivers/gpu/drm/radeon/Makefile
> @@ -60,8 +60,9 @@ radeon-y += radeon_device.o radeon_kms.o \
> rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \
> r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \
> r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \
> - evergreen.o radeon_atpx_handler.o
> + evergreen.o
>
> radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
> +radeon-$(CONFIG_VGA_SWITCHEROO) += radone_atpx_handler.o
typo. should be radeon_atpx_handler.o
Alex
>
> obj-$(CONFIG_DRM_RADEON)+= radeon.o
> diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> index 0ae52f1..3f557c4 100644
> --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> @@ -6,7 +6,6 @@
> *
> * ATPX support for both Intel/ATI
> */
> -
> #include <linux/vga_switcheroo.h>
> #include <acpi/acpi.h>
> #include <acpi/acpi_bus.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.h
> b/drivers/gpu/drm/radeon/radeon_drv.h
> index 4fe1646..ec55f2b 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.h
> +++ b/drivers/gpu/drm/radeon/radeon_drv.h
> @@ -463,8 +463,14 @@ extern void r600_blit_swap(struct drm_device *dev,
> int w, int h, int src_pitch, int dst_pitch, int
> cpp);
>
> /* atpx handler */
> +#if defined(CONFIG_VGA_SWITCHEROO)
> void radeon_register_atpx_handler(void);
> void radeon_unregister_atpx_handler(void);
> +#else
> +static inline void radeon_register_atpx_handler(void) {}
> +static inline void radeon_unregister_atpx_handler(void) {}
> +#endif
> +
> /* Flags for stats.boxes
> */
> #define RADEON_BOX_DMA_IDLE 0x1
> diff --git a/drivers/gpu/vga/vga_switcheroo.c
> b/drivers/gpu/vga/vga_switcheroo.c
> index a3f587a..d6d1149 100644
> --- a/drivers/gpu/vga/vga_switcheroo.c
> +++ b/drivers/gpu/vga/vga_switcheroo.c
> @@ -25,9 +25,6 @@
> #include <linux/debugfs.h>
> #include <linux/fb.h>
>
> -#include <acpi/acpi.h>
> -#include <acpi/acpi_bus.h>
> -
> #include <linux/pci.h>
> #include <linux/vga_switcheroo.h>
>
> diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
> index 4b58ab1..ae9ab13 100644
> --- a/include/linux/vga_switcheroo.h
> +++ b/include/linux/vga_switcheroo.h
> @@ -7,7 +7,6 @@
> * vga_switcheroo.h - Support for laptop with dual GPU using one set of
> outputs
> */
>
> -#include <acpi/acpi.h>
> #include <linux/fb.h>
>
> enum vga_switcheroo_state {
> --
> 1.6.5.2
>
>
> ------------------------------------------------------------------------------
> Download Intel® Parallel Studio Eval
> Try the new software tools for yourself. Speed compiling, find bugs
> proactively, and fine-tune applications for parallel performance.
> See why Intel Parallel Studio got high marks during beta.
> http://p.sf.net/sfu/intel-sw-dev
> --
> _______________________________________________
> Dri-devel mailing list
> Dri-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/dri-devel
>
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
