gma500: address the lid code

We need this for Poulsbo

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

3 files changed, 2 insertions, 3 deletions

diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index fc6045f926d..0e85978877e 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -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);
 
         acpi_video_register();
-        if (dev_priv->lid_state)
+        if (dev_priv->opregion.lid_state)
                 psb_lid_timer_init(dev_priv);
 
         ret = drm_vblank_init(dev, dev_priv->num_pipe);
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index 377393686a1..5c5c3d0350e 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -640,7 +640,6 @@ struct drm_psb_private {
         spinlock_t lid_lock;
         struct timer_list lid_timer;
         struct psb_intel_opregion opregion;
-        u32 *lid_state;
         u32 lid_last_state;
 
         /*
diff --git a/drivers/gpu/drm/gma500/psb_lid.c b/drivers/gpu/drm/gma500/psb_lid.c
index b867aabe6bf..7ff8bb2bdc2 100644
--- a/drivers/gpu/drm/gma500/psb_lid.c
+++ b/drivers/gpu/drm/gma500/psb_lid.c
@@ -29,7 +29,7 @@ static void psb_lid_timer_func(unsigned long data)
         struct drm_device *dev = (struct drm_device *)dev_priv->dev;
         struct timer_list *lid_timer = &dev_priv->lid_timer;
         unsigned long irq_flags;
-        u32 *lid_state = dev_priv->lid_state;
+        u32 __iomem *lid_state = dev_priv->opregion.lid_state;
         u32 pp_status;
 
         if (readl(lid_state) == dev_priv->lid_last_state)