Browse Source

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>
Alan Cox 14 years ago
parent
commit
9c6ac29cb0
2 changed files with 6 additions and 5 deletions
  1. 3 2
      drivers/staging/gma500/psb_drv.c
  2. 3 3
      drivers/staging/gma500/psb_gtt.c

+ 3 - 2
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:

+ 3 - 3
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",