From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: airlied@linux.ie, dri-devel@lists.freedesktop.org,
linux-acpi@vger.kernel.org
Subject: [PATCH 01/13] gma500: address the lid code
Date: Wed, 02 May 2012 19:12:48 +0100 [thread overview]
Message-ID: <20120502181237.26650.97502.stgit@bluebook> (raw)
In-Reply-To: <20120502181044.26650.40123.stgit@bluebook>
From: Alan Cox <alan@linux.intel.com>
We need this for Poulsbo
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
drivers/gpu/drm/gma500/psb_drv.c | 2 +-
drivers/gpu/drm/gma500/psb_drv.h | 1 -
drivers/gpu/drm/gma500/psb_lid.c | 2 +-
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 fc6045f..0e85978 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 3773936..5c5c3d0 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 b867aab..7ff8bb2b 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)
next prev parent reply other threads:[~2012-05-02 18:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-02 18:12 [PATCH 00/13] More GMA500 work Alan Cox
2012-05-02 18:12 ` Alan Cox [this message]
2012-05-02 18:13 ` [PATCH 02/13] gma500: psb_gtt_init(): drop unused variable Alan Cox
2012-05-02 18:13 ` [PATCH 03/13] gma500: gtt: fix __iomem sparse warnings Alan Cox
2012-05-02 18:13 ` [PATCH 04/13] gma500: sgx_reg and vdc_reg should be __iomem Alan Cox
2012-05-02 18:13 ` [PATCH 05/13] gma500: vram_addr " Alan Cox
2012-05-02 18:14 ` [PATCH 06/13] gma500: framebuffer: mark psb_fb_helper_funcs as static Alan Cox
2012-05-02 18:14 ` [PATCH 07/13] gma500: psb_irq_turn_off_dpst() fix bit operation Alan Cox
2012-05-02 18:14 ` [PATCH 08/13] gma500: lid_state should be __iomem Alan Cox
2012-05-02 18:16 ` [PATCH 09/13] gma500: oaktrail_hdmi_i2c_handler(): base " Alan Cox
2012-05-02 18:16 ` [PATCH 10/13] gma500: cdv_intel_lvds: mark cdv_intel_lvds_enc_funcs as static Alan Cox
2012-05-02 18:16 ` [PATCH 11/13] gma500: fix -Wmissing-include-dirs warnings Alan Cox
2012-05-02 18:17 ` [PATCH 12/13] gma500: mid-bios: rewrite VBT/GCT handling in a cleaner way Alan Cox
2012-05-02 18:17 ` [PATCH 13/13] gma500: mdfld_dsi_dpi_mode_set() do not corrupt DSPSTRIDE Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120502181237.26650.97502.stgit@bluebook \
--to=alan@lxorguk.ukuu.org.uk \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-acpi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).