From patchwork Mon Aug 23 06:46:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 123371 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7N6knhA007156 for ; Mon, 23 Aug 2010 06:46:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753308Ab0HWGqs (ORCPT ); Mon, 23 Aug 2010 02:46:48 -0400 Received: from compulab.co.il ([67.18.134.219]:52593 "EHLO compulab.co.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751978Ab0HWGqr (ORCPT ); Mon, 23 Aug 2010 02:46:47 -0400 Received: from mail.linux-boards.com ([192.114.83.142] helo=zimbra-mta.compulab.co.il) by compulab.site5.com with esmtp (Exim 4.69) (envelope-from ) id 1OnQnu-0001xf-Qs; Mon, 23 Aug 2010 01:46:47 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id E0A697E8B5A; Mon, 23 Aug 2010 09:46:45 +0300 (IDT) X-Virus-Scanned: amavisd-new at compulab.co.il Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q0VjXNsC7PRQ; Mon, 23 Aug 2010 09:46:42 +0300 (IDT) Received: from [10.1.1.77] (droid.compulab.local [10.1.1.77]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id DA6B47E8B55; Mon, 23 Aug 2010 09:46:41 +0300 (IDT) Message-ID: <4C72192A.9050801@compulab.co.il> Date: Mon, 23 Aug 2010 09:46:02 +0300 From: Mike Rapoport User-Agent: Thunderbird 2.0.0.23 (X11/20100106) MIME-Version: 1.0 To: Ameya Palande CC: tomi.valkeinen@nokia.com, linux-omap Subject: Re: DSS2 broken with 36-rc1 References: <1281962906.1888.25.camel@chotu> In-Reply-To: <1281962906.1888.25.camel@chotu> X-Enigmail-Version: 0.95.7 X-ACL-Warn: { X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - compulab.site5.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il X-Source: X-Source-Args: X-Source-Dir: Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 23 Aug 2010 06:46:51 +0000 (UTC) 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");