diff options
author | Alan Cox <alan@linux.jf.intel.com> | 2011-03-03 12:38:04 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 13:28:05 -0800 |
commit | 487e873dd3f8d7ede7635896e19376ef78157721 (patch) | |
tree | 96cf25cbc305c08ebc0c3a00c9c22506269bd5ae /drivers/staging/gma500/psb_irq.c | |
parent | 2145cff54f512907a4c4fa906f957fa62406e558 (diff) | |
download | op-kernel-dev-487e873dd3f8d7ede7635896e19376ef78157721.zip op-kernel-dev-487e873dd3f8d7ede7635896e19376ef78157721.tar.gz |
staging: gma500: Resync the patch queue with GregKH's space cleanup.
Remove all sorts of bits we can get rid of. We are now a very simple KMS
driver relying on the stolen memory for our framebuffer base (which is for
the moment hardcoded).
To support multiple frame buffers and some accel bits we will need some kind
of memory allocator, possibly a minimal use of GEM.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/psb_irq.c')
-rw-r--r-- | drivers/staging/gma500/psb_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/gma500/psb_irq.c b/drivers/staging/gma500/psb_irq.c index ce7dbf4..4597c88 100644 --- a/drivers/staging/gma500/psb_irq.c +++ b/drivers/staging/gma500/psb_irq.c @@ -422,9 +422,9 @@ void psb_irq_turn_on_dpst(struct drm_device *dev) if (ospm_power_using_hw_begin(OSPM_DISPLAY_ISLAND, OSPM_UHB_ONLY_IF_ON)) { - PSB_WVDC32(BIT31, HISTOGRAM_LOGIC_CONTROL); + PSB_WVDC32(1 << 31, HISTOGRAM_LOGIC_CONTROL); hist_reg = PSB_RVDC32(HISTOGRAM_LOGIC_CONTROL); - PSB_WVDC32(BIT31, HISTOGRAM_INT_CONTROL); + PSB_WVDC32(1 << 31, HISTOGRAM_INT_CONTROL); hist_reg = PSB_RVDC32(HISTOGRAM_INT_CONTROL); PSB_WVDC32(0x80010100, PWM_CONTROL_LOGIC); |