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

Commit a373bedd authored by Alan Cox's avatar Alan Cox Committed by Dave Airlie
Browse files

gma500: Fix build without ACPI 



Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d3029b4e

drivers/gpu/drm/gma500/Makefile

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

drivers/gpu/drm/gma500/opregion.c

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

drivers/gpu/drm/gma500/opregion.h

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

drivers/gpu/drm/gma500/psb_drv.h

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

 */

 */