From patchwork Tue Jan 24 18:49:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 137610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EAA57B6EFE for ; Wed, 25 Jan 2012 05:52:16 +1100 (EST) Received: from localhost ([::1]:50796 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RplTX-0007kK-BD for incoming@patchwork.ozlabs.org; Tue, 24 Jan 2012 13:52:11 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=B+AOtd+/49c7aU0rIjLzn6KBeOH7yfaMnyHhOtgWMFw=; b=YIfr6OzaugCcsklPKiaf9ovWojihB13KeRP643cGAJG/lZsfpoy7EfzvVRygnStD6Q WRughiwYxk5W23NyUx5cvU3XrjdurH2DNEuKdhkZMkKDLe78HZJI9mrtlCVX69mKw9AO k/KHAd/8jgJM4ZrPBoCE2L42MaOJRJj4IC38A= Received: by 10.205.120.17 with SMTP id fw17mr5455666bkc.74.1327431114264; Tue, 24 Jan 2012 10:51:54 -0800 (PST) Received: from anarsoul-laptop.lan ([46.28.100.58]) by mx.google.com with ESMTPS id ez5sm27759704bkc.15.2012.01.24.10.51.49 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jan 2012 10:51:51 -0800 (PST) From: Vasily Khoruzhick To: Peter Maydell , Andrzej Zaborowski , "qemu-devel@nongnu.org" Date: Tue, 24 Jan 2012 21:49:13 +0300 Message-Id: <1327430953-17699-1-git-send-email-anarsoul@gmail.com> X-Mailer: git-send-email 1.7.8.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.45 Cc: Vasily Khoruzhick Subject: [Qemu-devel] [PATCH] pxa2xx_lcd: SRAM is valid location for the framebuffer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }