dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

vga_switcheroo: fix build on platforms with no ACPI 

radeon was always including the atpx code unnecessarily, also core
switcheroo was including acpi headers.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2010-03-01 21:50:01 +11:00 committed by Dave Airlie
parent 55a5cb5d59
commit 8edb381d67
7 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/nouveau/nouveau_drv.h
View File

@ -852,8 +852,13 @@ extern int nouveau_dma_init(struct nouveau_channel *);
extern int nouveau_dma_wait(struct nouveau_channel *, int slots, int size);
/* nouveau_acpi.c */
#if defined(CONFIG_VGA_SWITCHEROO)
void nouveau_register_dsm_handler(void);
void nouveau_unregister_dsm_handler(void);
#else
static inline void nouveau_register_dsm_handler(void) {}
static inline void nouveau_unregister_dsm_handler(void) {}
#endif
/* nouveau_backlight.c */
#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT

3
drivers/gpu/drm/radeon/Makefile
View File

@ -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
obj-$(CONFIG_DRM_RADEON)+= radeon.o

11
drivers/gpu/drm/radeon/radeon.h
View File

@ -121,8 +121,19 @@ struct radeon_device;
*/
#define ATRM_BIOS_PAGE 4096
#if defined(CONFIG_VGA_SWITCHEROO)
bool radeon_atrm_supported(struct pci_dev *pdev);
int radeon_atrm_get_bios_chunk(uint8_t *bios, int offset, int len);
#else
static inline bool radeon_atrm_supported(struct pci_dev *pdev)
{
return false;
}
static inline int radeon_atrm_get_bios_chunk(uint8_t *bios, int offset, int len){
return -EINVAL;
}
#endif
bool radeon_get_bios(struct radeon_device *rdev);

1
drivers/gpu/drm/radeon/radeon_atpx_handler.c
View File

@ -6,7 +6,6 @@
*
* ATPX support for both Intel/ATI
*/
#include <linux/vga_switcheroo.h>
#include <acpi/acpi.h>
#include <acpi/acpi_bus.h>

6
drivers/gpu/drm/radeon/radeon_drv.h
View File

@ -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

3
drivers/gpu/vga/vga_switcheroo.c
View File

@ -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>

1
include/linux/vga_switcheroo.h
View File

@ -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 {