Commit 9c6ac29c authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

staging: gma500: Set the TWOD base

2D accel still doesn't work but now it doesn't crash either
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3350dead
...@@ -494,8 +494,9 @@ static int psb_do_init(struct drm_device *dev) ...@@ -494,8 +494,9 @@ static int psb_do_init(struct drm_device *dev)
PSB_CR_BIF_CTRL); PSB_CR_BIF_CTRL);
psb_spank(dev_priv); psb_spank(dev_priv);
printk(KERN_INFO "TWOD base %08lX\n", (u32) pg->mmu_gatt_start); /* mmu_gatt ?? */
PSB_WSGX32(pg->mmu_gatt_start, PSB_CR_BIF_TWOD_REQ_BASE); printk(KERN_INFO "TWOD base %08lX\n", (u32) pg->gatt_start);
PSB_WSGX32(pg->gatt_start, PSB_CR_BIF_TWOD_REQ_BASE);
return 0; return 0;
out_err: out_err:
......
...@@ -117,9 +117,9 @@ int psb_gtt_init(struct psb_gtt *pg, int resume) ...@@ -117,9 +117,9 @@ int psb_gtt_init(struct psb_gtt *pg, int resume)
pg->gatt_start, pg->gatt_pages/256); 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", 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); pg->gtt_start, gtt_pages * 4, pg->gtt_phys_start);
printk(KERN_INFO "Stole memory information\n"); printk(KERN_INFO "Stolen memory information\n");
printk(KERN_INFO " base in RAM: 0x%x\n", pg->stolen_base); 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 " size: %luK, calculated by (GTT RAM base) - (Stolen base), seems wrong\n",
vram_stolen_size/1024); vram_stolen_size/1024);
dvmt_mode = (pg->gmch_ctrl >> 4) & 0x7; dvmt_mode = (pg->gmch_ctrl >> 4) & 0x7;
printk(KERN_INFO " the correct size should be: %dM(dvmt mode=%d)\n", printk(KERN_INFO " the correct size should be: %dM(dvmt mode=%d)\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment