summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/gma500/psb_drv.h
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-05-03 15:06:18 +0100
committerDave Airlie <airlied@redhat.com>2012-05-07 10:58:20 +0100
commitd839ede47a56ff5f316c88391818488f8e5913af (patch)
tree3c874685ccfa8eb690be547b805166372e592c83 /drivers/gpu/drm/gma500/psb_drv.h
parent9aba9d3a2ca42572c9c196e8be6cab59b7c078b6 (diff)
downloadlinux-3.10-d839ede47a56ff5f316c88391818488f8e5913af.tar.gz
linux-3.10-d839ede47a56ff5f316c88391818488f8e5913af.tar.bz2
linux-3.10-d839ede47a56ff5f316c88391818488f8e5913af.zip
gma500: opregion and ACPI
Add the opregion support and bring us in line with the opregion functionality in the reference driver code. We can't share this with i915 currently because there are hardcoded assumptions about dev_priv etc in both versions. [airlied: include opregion.h fix] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/psb_drv.h')
-rw-r--r--drivers/gpu/drm/gma500/psb_drv.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index d3528a69420..377393686a1 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -30,6 +30,7 @@
#include "psb_intel_drv.h"
#include "gtt.h"
#include "power.h"
+#include "opregion.h"
#include "oaktrail.h"
/* Append new drm mode definition here, align with libdrm definition */
@@ -120,6 +121,7 @@ enum {
#define PSB_HWSTAM 0x2098
#define PSB_INSTPM 0x20C0
#define PSB_INT_IDENTITY_R 0x20A4
+#define _PSB_IRQ_ASLE (1<<0)
#define _MDFLD_PIPEC_EVENT_FLAG (1<<2)
#define _MDFLD_PIPEC_VBLANK_FLAG (1<<3)
#define _PSB_DPST_PIPEB_FLAG (1<<4)
@@ -259,7 +261,7 @@ struct psb_intel_opregion {
struct opregion_swsci *swsci;
struct opregion_asle *asle;
void *vbt;
- int enabled;
+ u32 __iomem *lid_state;
};
struct sdvo_device_mapping {