staging: gma500: Set the TWOD base

2D accel still doesn't work but now it doesn't crash either

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c
index 8978ed657857bbd7d07731eacb65e5170423c74d..05c31b9b43fcb8edf446f7e2e36e635bb06d6a09 100644 (file)
--- a/drivers/staging/gma500/psb_drv.c
+++ b/drivers/staging/gma500/psb_drv.c
@@ -494,8 +494,9 @@ static int psb_do_init(struct drm_device *dev)
                                                        PSB_CR_BIF_CTRL);
        psb_spank(dev_priv);
 
-       printk(KERN_INFO "TWOD base %08lX\n", (u32) pg->mmu_gatt_start);
-       PSB_WSGX32(pg->mmu_gatt_start, PSB_CR_BIF_TWOD_REQ_BASE);
+       /* mmu_gatt ?? */
+       printk(KERN_INFO "TWOD base %08lX\n", (u32) pg->gatt_start);
+       PSB_WSGX32(pg->gatt_start, PSB_CR_BIF_TWOD_REQ_BASE);
 
        return 0;
 out_err:

diff --git a/drivers/staging/gma500/psb_gtt.c b/drivers/staging/gma500/psb_gtt.c
index c1283e836b23f6768a9bb1e66c7a1be118a91384..093d7dfee8932a6a30a38392a9a32bd34f57f42e 100644 (file)
--- a/drivers/staging/gma500/psb_gtt.c
+++ b/drivers/staging/gma500/psb_gtt.c
@@ -117,9 +117,9 @@ int psb_gtt_init(struct psb_gtt *pg, int resume)
                pg->gatt_start, pg->gatt_pages/256);
        printk(KERN_INFO"GTTADR(region 3) start: 0x%08x (can map %dM RAM), and actual RAM base 0x%08x.\n",
                pg->gtt_start, gtt_pages * 4, pg->gtt_phys_start);
-       printk(KERN_INFO "Stole memory information\n");
-       printk(KERN_INFO "      base in RAM: 0x%x\n", pg->stolen_base);
-       printk(KERN_INFO "      size: %luK, calculated by (GTT RAM base) - (Stolen base), seems wrong\n",
+       printk(KERN_INFO "Stolen memory information\n");
+       printk(KERN_INFO "       base in RAM: 0x%x\n", pg->stolen_base);
+       printk(KERN_INFO "       size: %luK, calculated by (GTT RAM base) - (Stolen base), seems wrong\n",
                vram_stolen_size/1024);
        dvmt_mode = (pg->gmch_ctrl >> 4) & 0x7;
        printk(KERN_INFO "      the correct size should be: %dM(dvmt mode=%d)\n",