From ade980bc2a17d9c7b605cc2674f2da8d97d3f7db Mon Sep 17 00:00:00 2001 From: Patrik Jakobsson Date: Fri, 8 Jul 2011 09:44:03 +0100 Subject: [PATCH] --- yaml --- r: 260006 b: refs/heads/master c: 2b9428e20333ee42d00335c9700dcb20cf54f384 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/gtt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index abfd9a60500a..c7c55775c05c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ed836acd2c7760e03c639566b59b4c1cc53a792 +refs/heads/master: 2b9428e20333ee42d00335c9700dcb20cf54f384 diff --git a/trunk/drivers/staging/gma500/gtt.c b/trunk/drivers/staging/gma500/gtt.c index 28f2261b6222..78dd01bb1eb6 100644 --- a/trunk/drivers/staging/gma500/gtt.c +++ b/trunk/drivers/staging/gma500/gtt.c @@ -397,7 +397,7 @@ int psb_gtt_init(struct drm_device *dev, int resume) /* The root resource we allocate address space from */ dev_priv->gtt_initialized = 1; - pg->gtt_phys_start = dev_priv->pge_ctl; + pg->gtt_phys_start = dev_priv->pge_ctl & PAGE_MASK; /* * FIXME: video mmu has hw bug to access 0x0D0000000,