diff mbox

DSS2 broken with 36-rc1

Message ID 4C72192A.9050801@compulab.co.il (mailing list archive)
State New, archived
Delegated to: Tomi Valkeinen
Headers show

Commit Message

Mike Rapoport Aug. 23, 2010, 6:46 a.m. UTC 
None
diff mbox

Patch

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 04034d4..7f7b1c2 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1436,7 +1436,10 @@  static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
  	}

  	if (ofbi->rotation_type != OMAP_DSS_ROT_VRFB) {
-		vaddr = ioremap_wc(paddr, size);
+		if (region_mem_type(paddr) == OMAP_VRAM_MEMTYPE_SDRAM)
+			vaddr = phys_to_virt(paddr);
+		else
+			vaddr = ioremap_wc(paddr, size);

  		if (!vaddr) {
  			dev_err(fbdev->dev, "failed to ioremap framebuffer\n");