leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gma500: Fix build without ACPI

Browse Source 
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Alan Cox
2012-05-11 11:29:41 +01:00
committed by Dave Airlie
parent d3029b4e03
commit a373bedd7e
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,6 @@ gma500_gfx-y += gem_glue.o \
intel_i2c.o \ intel_i2c.o \
intel_gmbus.o \ intel_gmbus.o \
mmu.o \ mmu.o \
opregion.o \
power.o \ power.o \
psb_drv.o \ psb_drv.o \
psb_intel_display.o \ psb_intel_display.o \
@@ -25,6 +24,8 @@ gma500_gfx-y += gem_glue.o \
psb_device.o \ psb_device.o \
mid_bios.o mid_bios.o
gma500_gfx-$(CONFIG_ACPI) += opregion.o \
gma500_gfx-$(CONFIG_DRM_GMA3600) += cdv_device.o \ gma500_gfx-$(CONFIG_DRM_GMA3600) += cdv_device.o \
cdv_intel_crt.o \ cdv_intel_crt.o \
cdv_intel_display.o \ cdv_intel_display.o \

6
drivers/gpu/drm/gma500/opregion.c
View File

@@ -21,10 +21,8 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
* *
*/ */
#ifdef CONFIG_ACPI
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/acpi_io.h> #include <linux/acpi_io.h>
#endif
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
@@ -311,11 +309,7 @@ int psb_intel_opregion_setup(struct drm_device *dev)
return -ENOTSUPP; return -ENOTSUPP;
} }
DRM_DEBUG("OpRegion detected at 0x%8x\n", opregion_phy); DRM_DEBUG("OpRegion detected at 0x%8x\n", opregion_phy);
#ifdef CONFIG_ACPI
base = acpi_os_ioremap(opregion_phy, 8*1024); base = acpi_os_ioremap(opregion_phy, 8*1024);
#else
base = ioremap(opregion_phy, 8*1024);
#endif
if (!base) if (!base)
return -ENOMEM; return -ENOMEM;

22
drivers/gpu/drm/gma500/opregion.h
View File

@@ -22,8 +22,28 @@
* *
*/ */
#if defined(CONFIG_ACPI)
extern void psb_intel_opregion_asle_intr(struct drm_device *dev); extern void psb_intel_opregion_asle_intr(struct drm_device *dev);
extern void psb_intel_opregion_enable_asle(struct drm_device *dev);
extern void psb_intel_opregion_init(struct drm_device *dev); extern void psb_intel_opregion_init(struct drm_device *dev);
extern void psb_intel_opregion_fini(struct drm_device *dev); extern void psb_intel_opregion_fini(struct drm_device *dev);
extern int psb_intel_opregion_setup(struct drm_device *dev); extern int psb_intel_opregion_setup(struct drm_device *dev);
#else
extern inline void psb_intel_opregion_asle_intr(struct drm_device *dev)
{
}
extern inline void psb_intel_opregion_init(struct drm_device *dev)
{
}
extern inline void psb_intel_opregion_fini(struct drm_device *dev)
{
}
extern inline int psb_intel_opregion_setup(struct drm_device *dev)
{
return 0;
}
#endif

6
drivers/gpu/drm/gma500/psb_drv.h
View File

@@ -807,12 +807,6 @@ psb_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);
extern u32 psb_get_vblank_counter(struct drm_device *dev, int crtc); extern u32 psb_get_vblank_counter(struct drm_device *dev, int crtc);
/*
* intel_opregion.c
*/
extern int gma_intel_opregion_init(struct drm_device *dev);
extern int gma_intel_opregion_exit(struct drm_device *dev);
/* /*
* framebuffer.c * framebuffer.c
*/ */