From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RplTO-0007id-Kd for qemu-devel@nongnu.org; Tue, 24 Jan 2012 13:52:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RplTI-0006Pv-JZ for qemu-devel@nongnu.org; Tue, 24 Jan 2012 13:52:02 -0500 Received: from mail-bk0-f45.google.com ([209.85.214.45]:36187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RplTI-0006Pk-80 for qemu-devel@nongnu.org; Tue, 24 Jan 2012 13:51:56 -0500 Received: by bkbzu17 with SMTP id zu17so2028550bkb.4 for ; Tue, 24 Jan 2012 10:51:54 -0800 (PST) From: Vasily Khoruzhick Date: Tue, 24 Jan 2012 21:49:13 +0300 Message-Id: <1327430953-17699-1-git-send-email-anarsoul@gmail.com> Subject: [Qemu-devel] [PATCH] pxa2xx_lcd: SRAM is valid location for the framebuffer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , Andrzej Zaborowski , "qemu-devel@nongnu.org" Cc: Vasily Khoruzhick Signed-off-by: Vasily Khoruzhick --- hw/pxa2xx_lcd.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c index 4e9f7b4..b39abbb 100644 --- a/hw/pxa2xx_lcd.c +++ b/hw/pxa2xx_lcd.c @@ -311,6 +311,10 @@ static void pxa2xx_descriptor_load(PXA2xxLCDState *s) if (!(descptr >= PXA2XX_SDRAM_BASE && descptr + sizeof(desc) <= PXA2XX_SDRAM_BASE + ram_size)) continue; + if (!(descptr >= PXA2XX_INTERNAL_BASE && descptr + + sizeof(desc) <= PXA2XX_INTERNAL_BASE + PXA2XX_INTERNAL_SIZE)) { + continue; + } cpu_physical_memory_read(descptr, (void *)&desc, sizeof(desc)); s->dma_ch[i].descriptor = tswap32(desc.fdaddr); @@ -830,8 +834,10 @@ static void pxa2xx_update_display(void *opaque) continue; } fbptr = s->dma_ch[ch].source; - if (!(fbptr >= PXA2XX_SDRAM_BASE && - fbptr <= PXA2XX_SDRAM_BASE + ram_size)) { + if (!((fbptr >= PXA2XX_SDRAM_BASE && + fbptr <= PXA2XX_SDRAM_BASE + ram_size) || + (fbptr >= PXA2XX_INTERNAL_BASE && + fbptr <= PXA2XX_INTERNAL_BASE + PXA2XX_INTERNAL_SIZE))) { pxa2xx_dma_ber_set(s, ch); continue; } -- 1.7.8.4