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>

diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index fc6045f926d610cef336e5e4f117579cc3fd1f55..0e85978877e8a933e457b0f3cf2a1025732ab01f 100644 (file)
--- 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 377393686a12ee799864bbc7f283d409d6819ffe..5c5c3d0350e5e6245f80e805d37a71884fe5f861 100644 (file)
--- 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 b867aabe6bf3e405b501191f88f4da1c90410136..7ff8bb2bdc23371f7023b821604117f9c61a20a3 100644 (file)
--- 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)