From 452a88eb6811d8175ad8b18c0adbb17c93162dd9 Mon Sep 17 00:00:00 2001 From: zrj Date: Tue, 10 May 2016 16:10:27 +0300 Subject: [PATCH] drm/radeon: Add ACPI function stubs. Reduces diffs in radeon_bios with Linux v3.18 --- sys/dev/drm/radeon/radeon_bios.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/dev/drm/radeon/radeon_bios.c b/sys/dev/drm/radeon/radeon_bios.c index 550af2c244..0665cecce6 100644 --- a/sys/dev/drm/radeon/radeon_bios.c +++ b/sys/dev/drm/radeon/radeon_bios.c @@ -137,6 +137,7 @@ static bool radeon_read_platform_bios(struct radeon_device *rdev) return true; } +#ifdef CONFIG_ACPI /* ATRM is used to get the BIOS on the discrete cards in * dual-gpu systems. */ @@ -268,6 +269,12 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) } return true; } +#else +static inline bool radeon_atrm_get_bios(struct radeon_device *rdev) +{ + return false; +} +#endif static bool ni_read_disabled_bios(struct radeon_device *rdev) { @@ -630,6 +637,7 @@ static bool radeon_read_disabled_bios(struct radeon_device *rdev) return legacy_read_disabled_bios(rdev); } +#ifdef CONFIG_ACPI static bool radeon_acpi_vfct_bios(struct radeon_device *rdev) { bool ret = false; @@ -688,6 +696,12 @@ static bool radeon_acpi_vfct_bios(struct radeon_device *rdev) out_unmap: return ret; } +#else +static inline bool radeon_acpi_vfct_bios(struct radeon_device *rdev) +{ + return false; +} +#endif bool radeon_get_bios(struct radeon_device *rdev) { -- 2.11.4.GIT