From: Ben Skeggs Date: Sun, 30 May 2010 23:04:03 +0000 (+1000) Subject: drm/nv50: cast IGP memory location to u64 before shifting X-Git-Tag: v2.6.35-rc2~52^2~13^2 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=8b281db596744a15b2abbfdbf655796c64e172ca;p=net-next-2.6.git drm/nv50: cast IGP memory location to u64 before shifting Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 775a7017af6..c1fd42b0dad 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -540,7 +540,8 @@ nouveau_mem_detect(struct drm_device *dev) dev_priv->vram_size = nv_rd32(dev, NV04_FIFO_DATA); dev_priv->vram_size &= NV10_FIFO_DATA_RAM_AMOUNT_MB_MASK; if (dev_priv->chipset == 0xaa || dev_priv->chipset == 0xac) - dev_priv->vram_sys_base = nv_rd32(dev, 0x100e10) << 12; + dev_priv->vram_sys_base = nv_rd32(dev, 0x100e10); + dev_priv->vram_sys_base <<= 12; } NV_INFO(dev, "Detected %dMiB VRAM\n", (int)(dev_priv->vram_size >> 20));