From d43fbcc6c53d055e2c9cace06367cb65791dc0a2 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Sun, 11 Dec 2011 01:31:17 +1000 Subject: [PATCH] --- yaml --- r: 293721 b: refs/heads/master c: ddfd2da48421e6b217e8b4fa7ec967e55555ce65 h: refs/heads/master i: 293719: aa527f471e915ddbef9411cb8195986e2a26bcb8 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_fb.c | 5 +++++ trunk/drivers/gpu/drm/nouveau/nv10_fb.c | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 153f3484fe22..a702bbf9f0f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ad2d31cb692597f7918fce2f52a4c1949fbcf8d +refs/heads/master: ddfd2da48421e6b217e8b4fa7ec967e55555ce65 diff --git a/trunk/drivers/gpu/drm/nouveau/nv04_fb.c b/trunk/drivers/gpu/drm/nouveau/nv04_fb.c index db16c47fd922..d5eedd67afe5 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv04_fb.c +++ b/trunk/drivers/gpu/drm/nouveau/nv04_fb.c @@ -29,6 +29,11 @@ nv04_fb_vram_init(struct drm_device *dev) } } + if ((boot0 & 0x00000038) <= 0x10) + dev_priv->vram_type = NV_MEM_TYPE_SGRAM; + else + dev_priv->vram_type = NV_MEM_TYPE_SDRAM; + return 0; } diff --git a/trunk/drivers/gpu/drm/nouveau/nv10_fb.c b/trunk/drivers/gpu/drm/nouveau/nv10_fb.c index 7b17dea5f62b..447d6f236526 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv10_fb.c +++ b/trunk/drivers/gpu/drm/nouveau/nv10_fb.c @@ -35,6 +35,14 @@ nv10_fb_vram_init(struct drm_device *dev) u32 fifo_data = nv_rd32(dev, NV04_PFB_FIFO_DATA); dev_priv->vram_size = fifo_data & NV10_PFB_FIFO_DATA_RAM_AMOUNT_MB_MASK; + if (dev_priv->card_type < NV_20) { + u32 cfg0 = nv_rd32(dev, 0x100200); + if (cfg0 & 0x00000001) + dev_priv->vram_type = NV_MEM_TYPE_DDR1; + else + dev_priv->vram_type = NV_MEM_TYPE_SDRAM; + } + return 0; }