Commit 25933dde authored by Alan Cox's avatar Alan Cox Committed by Dave Airlie

gma500: address the lid code

We need this for Poulsbo
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d839ede4
...@@ -351,7 +351,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) ...@@ -351,7 +351,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
PSB_WSGX32(0x30000000, PSB_CR_BIF_3D_REQ_BASE); PSB_WSGX32(0x30000000, PSB_CR_BIF_3D_REQ_BASE);
acpi_video_register(); acpi_video_register();
if (dev_priv->lid_state) if (dev_priv->opregion.lid_state)
psb_lid_timer_init(dev_priv); psb_lid_timer_init(dev_priv);
ret = drm_vblank_init(dev, dev_priv->num_pipe); ret = drm_vblank_init(dev, dev_priv->num_pipe);
......
...@@ -640,7 +640,6 @@ struct drm_psb_private { ...@@ -640,7 +640,6 @@ struct drm_psb_private {
spinlock_t lid_lock; spinlock_t lid_lock;
struct timer_list lid_timer; struct timer_list lid_timer;
struct psb_intel_opregion opregion; struct psb_intel_opregion opregion;
u32 *lid_state;
u32 lid_last_state; u32 lid_last_state;
/* /*
......
...@@ -29,7 +29,7 @@ static void psb_lid_timer_func(unsigned long data) ...@@ -29,7 +29,7 @@ static void psb_lid_timer_func(unsigned long data)
struct drm_device *dev = (struct drm_device *)dev_priv->dev; struct drm_device *dev = (struct drm_device *)dev_priv->dev;
struct timer_list *lid_timer = &dev_priv->lid_timer; struct timer_list *lid_timer = &dev_priv->lid_timer;
unsigned long irq_flags; unsigned long irq_flags;
u32 *lid_state = dev_priv->lid_state; u32 __iomem *lid_state = dev_priv->opregion.lid_state;
u32 pp_status; u32 pp_status;
if (readl(lid_state) == dev_priv->lid_last_state) if (readl(lid_state) == dev_priv->lid_last_state)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment