Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8edb381d authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

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: default avatarDave Airlie <airlied@redhat.com>
parent 55a5cb5d

drivers/gpu/drm/nouveau/nouveau_drv.h

+5 −0
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/radeon/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/radeon/radeon.h

+11 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/radeon/radeon_atpx_handler.c

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
 *

 * ATPX support for both Intel/ATI

 */



#include <linux/vga_switcheroo.h>

#include <acpi/acpi.h>

#include <acpi/acpi_bus.h>

drivers/gpu/drm/radeon/radeon_drv.h

+6 −0
Original line number Diff line number Diff line
@@ -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