From patchwork Thu Jan 12 19:30:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 135685 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 056F8B6FA5 for ; Fri, 13 Jan 2012 06:33:11 +1100 (EST) Received: from localhost ([::1]:38434 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlQOZ-00033D-TM for incoming@patchwork.ozlabs.org; Thu, 12 Jan 2012 14:33:07 -0500 Received: from eggs.gnu.org ([140.186.70.92]:40678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlQOS-000337-22 for qemu-devel@nongnu.org; Thu, 12 Jan 2012 14:33:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RlQOQ-0002qF-Uj for qemu-devel@nongnu.org; Thu, 12 Jan 2012 14:33:00 -0500 Received: from mail-bk0-f45.google.com ([209.85.214.45]:58620) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlQOQ-0002pj-Oa for qemu-devel@nongnu.org; Thu, 12 Jan 2012 14:32:58 -0500 Received: by mail-bk0-f45.google.com with SMTP id j5so1593887bkw.4 for ; Thu, 12 Jan 2012 11:32:58 -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:in-reply-to:references; bh=pyoYtOp54s+CHVXbm/iYqFGlWW++TgTlKjDLDX7fKaE=; b=bT2Q7XpDMqjc8AH7jF7OPlkr2bN2wwhAIA6aAbFAFCQSexq1RRaBhzOSIFwnUdzlIw YpSghSK8yCoRO/AqGxTonTEMuoBcqkr3UFRUMC7XxuImv/5+3u33zqvJf46RXdw35dCf J7tZPkAWbRm2236jyNbapp1EFVpimvpJbn15Y= Received: by 10.204.153.28 with SMTP id i28mr1742704bkw.136.1326396778368; Thu, 12 Jan 2012 11:32:58 -0800 (PST) Received: from anarsoul-laptop.lan ([46.28.102.157]) by mx.google.com with ESMTPS id iu2sm12763780bkb.0.2012.01.12.11.32.56 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 Jan 2012 11:32:57 -0800 (PST) From: Vasily Khoruzhick To: Peter Maydell , "qemu-devel@nongnu.org" Date: Thu, 12 Jan 2012 22:30:35 +0300 Message-Id: <1326396635-14071-2-git-send-email-anarsoul@gmail.com> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1326396635-14071-1-git-send-email-anarsoul@gmail.com> References: <1326396635-14071-1-git-send-email-anarsoul@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.45 Cc: Vasily Khoruzhick Subject: [Qemu-devel] [PATCH 2/2] pxa2xx_lcd: fix palette parser 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 Pallete entry size for 16bpp format is 2 bytes, not 4 Signed-off-by: Vasily Khoruzhick --- hw/pxa2xx_lcd.c | 51 ++++++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c index 5dd4ef0..02e237e 100644 --- a/hw/pxa2xx_lcd.c +++ b/hw/pxa2xx_lcd.c @@ -574,7 +574,8 @@ static const MemoryRegionOps pxa2xx_lcdc_ops = { static void pxa2xx_palette_parse(PXA2xxLCDState *s, int ch, int bpp) { int i, n, format, r, g, b, alpha; - uint32_t *dest, *src; + uint32_t *dest; + uint8_t *src; s->pal_for = LCCR4_PALFOR(s->control[4]); format = s->pal_for; @@ -593,7 +594,7 @@ static void pxa2xx_palette_parse(PXA2xxLCDState *s, int ch, int bpp) return; } - src = (uint32_t *) s->dma_ch[ch].pbuffer; + src = (uint8_t *) s->dma_ch[ch].pbuffer; dest = (uint32_t *) s->dma_ch[ch].palette; alpha = r = g = b = 0; @@ -601,43 +602,48 @@ static void pxa2xx_palette_parse(PXA2xxLCDState *s, int ch, int bpp) switch (format) { case 0: /* 16 bpp, no transparency */ alpha = 0; - if (s->control[0] & LCCR0_CMS) - r = g = b = *src & 0xff; + if (s->control[0] & LCCR0_CMS) { + r = g = b = *(uint16_t *)src & 0xff; + } else { - r = (*src & 0xf800) >> 8; - g = (*src & 0x07e0) >> 3; - b = (*src & 0x001f) << 3; + r = (*(uint16_t *)src & 0xf800) >> 8; + g = (*(uint16_t *)src & 0x07e0) >> 3; + b = (*(uint16_t *)src & 0x001f) << 3; } + src += 2; break; case 1: /* 16 bpp plus transparency */ - alpha = *src & (1 << 24); + alpha = *(uint16_t *)src & (1 << 24); if (s->control[0] & LCCR0_CMS) - r = g = b = *src & 0xff; + r = g = b = *(uint16_t *)src & 0xff; else { - r = (*src & 0xf800) >> 8; - g = (*src & 0x07e0) >> 3; - b = (*src & 0x001f) << 3; + r = (*(uint16_t *)src & 0xf800) >> 8; + g = (*(uint16_t *)src & 0x07e0) >> 3; + b = (*(uint16_t *)src & 0x001f) << 3; } + src += 2; break; case 2: /* 18 bpp plus transparency */ - alpha = *src & (1 << 24); + alpha = *(uint32_t *)src & (1 << 24); if (s->control[0] & LCCR0_CMS) - r = g = b = *src & 0xff; + r = g = b = *(uint32_t *)src & 0xff; else { - r = (*src & 0xf80000) >> 16; - g = (*src & 0x00fc00) >> 8; - b = (*src & 0x0000f8); + r = (*(uint32_t *)src & 0xf80000) >> 16; + g = (*(uint32_t *)src & 0x00fc00) >> 8; + b = (*(uint32_t *)src & 0x0000f8); } + src += 4; break; case 3: /* 24 bpp plus transparency */ - alpha = *src & (1 << 24); + alpha = *(uint32_t *)src & (1 << 24); if (s->control[0] & LCCR0_CMS) - r = g = b = *src & 0xff; + r = g = b = *(uint32_t *)src & 0xff; else { - r = (*src & 0xff0000) >> 16; - g = (*src & 0x00ff00) >> 8; - b = (*src & 0x0000ff); + r = (*(uint32_t *)src & 0xff0000) >> 16; + g = (*(uint32_t *)src & 0x00ff00) >> 8; + b = (*(uint32_t *)src & 0x0000ff); } + src += 4; break; } switch (ds_get_bits_per_pixel(s->ds)) { @@ -657,7 +663,6 @@ static void pxa2xx_palette_parse(PXA2xxLCDState *s, int ch, int bpp) *dest = rgb_to_pixel32(r, g, b) | alpha; break; } - src ++; dest ++; } }