From patchwork Tue Sep 2 08:00:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 385007 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 18DB31401AA for ; Tue, 2 Sep 2014 18:07:46 +1000 (EST) Received: from localhost ([::1]:36451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOj7w-0008WF-4L for incoming@patchwork.ozlabs.org; Tue, 02 Sep 2014 04:07:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOj1M-0005hX-My for qemu-devel@nongnu.org; Tue, 02 Sep 2014 04:01:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XOj1F-0004hG-D2 for qemu-devel@nongnu.org; Tue, 02 Sep 2014 04:00:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34095) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOj1F-0004gq-5O for qemu-devel@nongnu.org; Tue, 02 Sep 2014 04:00:49 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8280lFV018981 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 2 Sep 2014 04:00:48 -0400 Received: from nilsson.home.kraxel.org (ovpn-116-47.ams2.redhat.com [10.36.116.47]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8280ijO010123; Tue, 2 Sep 2014 04:00:46 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 2E80A808D5; Tue, 2 Sep 2014 10:00:42 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 2 Sep 2014 10:00:26 +0200 Message-Id: <1409644827-26317-14-git-send-email-kraxel@redhat.com> In-Reply-To: <1409644827-26317-1-git-send-email-kraxel@redhat.com> References: <1409644827-26317-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 13/14] [wip] pl110: switch some conversions to swap+pixman mode 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 Add swapmode to struct pl110_draw_fn, handle more framebuffer formats that way. Signed-off-by: Gerd Hoffmann --- hw/display/pl110.c | 26 +++++++++++++++++--------- hw/display/pl110_template.h | 45 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 52 insertions(+), 19 deletions(-) diff --git a/hw/display/pl110.c b/hw/display/pl110.c index 0dbc526..6d8ae4b 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -205,7 +205,8 @@ static void pl110_update_display(void *opaque) if (s->invalidate || surface_width(surface) != s->cols || surface_height(surface) != s->rows) { - if (pl110_draw[bpp_offset].fmt) { + if (pl110_draw[bpp_offset].fmt && + pl110_draw[bpp_offset].swap == FB_SWAP_NONE) { surface = qemu_create_displaysurface_guestmem (s->cols, s->rows, pl110_draw[bpp_offset].fmt, 0, s->upbase); dpy_gfx_replace_surface(s->con, surface); @@ -223,15 +224,22 @@ static void pl110_update_display(void *opaque) s->upbase, s->invalidate); } else { g_assert(surface_bits_per_pixel(surface) == 32); - dest_width = 4 * s->cols; first = 0; - fn = pl110_draw[bpp_offset].fn; - framebuffer_update_display(surface, sysbus_address_space(sbd), - s->upbase, s->cols, s->rows, - src_width, dest_width, 0, - s->invalidate, - fn, s->palette, - &first, &last); + if (pl110_draw[bpp_offset].fmt) { + framebuffer_update_display_swap_pixman + (surface, sysbus_address_space(sbd), s->upbase, + pl110_draw[bpp_offset].swap, pl110_draw[bpp_offset].fmt, + s->invalidate, &first, &last); + } else { + dest_width = 4 * s->cols; + fn = pl110_draw[bpp_offset].fn; + framebuffer_update_display(surface, sysbus_address_space(sbd), + s->upbase, s->cols, s->rows, + src_width, dest_width, 0, + s->invalidate, + fn, s->palette, + &first, &last); + } if (first >= 0) { dpy_gfx_update(s->con, 0, first, s->cols, last - first + 1); } diff --git a/hw/display/pl110_template.h b/hw/display/pl110_template.h index 1eee28d..d81a388 100644 --- a/hw/display/pl110_template.h +++ b/hw/display/pl110_template.h @@ -41,16 +41,29 @@ static struct { drawfn fn; pixman_format_code_t fmt; + enum framebuffer_swapmode swap; } pl110_draw[48] = { { .fn = pl110_draw_line1_lblp_bgr }, { .fn = pl110_draw_line2_lblp_bgr }, { .fn = pl110_draw_line4_lblp_bgr }, { .fn = pl110_draw_line8_lblp_bgr }, - { .fn = pl110_draw_line16_555_lblp_bgr, .fmt = LEBE(PIXMAN_x1r5g5b5, 0) }, - { .fn = pl110_draw_line32_lblp_bgr, .fmt = LEBE(PIXMAN_x8r8g8b8, - PIXMAN_b8g8r8a8) }, - { .fn = pl110_draw_line16_lblp_bgr, .fmt = LEBE(PIXMAN_r5g6b5, 0) }, - { .fn = pl110_draw_line12_lblp_bgr, .fmt = LEBE(PIXMAN_x4r4g4b4, 0) }, + { + .fn = pl110_draw_line16_555_lblp_bgr, + .fmt = PIXMAN_x1r5g5b5, + .swap = LEBE(FB_SWAP_NONE, FB_SWAP_16_BYTES), + },{ + .fn = pl110_draw_line32_lblp_bgr, + .fmt = LEBE(PIXMAN_x8r8g8b8, PIXMAN_b8g8r8a8), + .swap = FB_SWAP_NONE + },{ + .fn = pl110_draw_line16_lblp_bgr, + .fmt = PIXMAN_r5g6b5, + .swap = LEBE(FB_SWAP_NONE, FB_SWAP_16_BYTES), + },{ + .fn = pl110_draw_line12_lblp_bgr, + .fmt = PIXMAN_x4r4g4b4, + .swap = LEBE(FB_SWAP_NONE, FB_SWAP_16_BYTES) + }, { .fn = pl110_draw_line1_bbbp_bgr }, { .fn = pl110_draw_line2_bbbp_bgr }, @@ -66,11 +79,23 @@ static struct { { .fn = pl110_draw_line2_lbbp_bgr }, { .fn = pl110_draw_line4_lbbp_bgr }, { .fn = pl110_draw_line8_lbbp_bgr }, - { .fn = pl110_draw_line16_555_lbbp_bgr, .fmt = LEBE(PIXMAN_x1r5g5b5, 0) }, - { .fn = pl110_draw_line32_lbbp_bgr, .fmt = LEBE(PIXMAN_x8r8g8b8, - PIXMAN_b8g8r8a8) }, - { .fn = pl110_draw_line16_lbbp_bgr, .fmt = LEBE(PIXMAN_r5g6b5, 0) }, - { .fn = pl110_draw_line12_lbbp_bgr, .fmt = LEBE(PIXMAN_x4r4g4b4, 0) }, + { + .fn = pl110_draw_line16_555_lbbp_bgr, + .fmt = PIXMAN_x1r5g5b5, + .swap = LEBE(FB_SWAP_NONE, FB_SWAP_16_BYTES), + },{ + .fn = pl110_draw_line32_lbbp_bgr, + .fmt = LEBE(PIXMAN_x8r8g8b8, PIXMAN_b8g8r8a8), + .swap = FB_SWAP_NONE + },{ + .fn = pl110_draw_line16_lbbp_bgr, + .fmt = PIXMAN_r5g6b5, + .swap = LEBE(FB_SWAP_NONE, FB_SWAP_16_BYTES), + },{ + .fn = pl110_draw_line12_lbbp_bgr, + .fmt = PIXMAN_x4r4g4b4, + .swap = LEBE(FB_SWAP_NONE, FB_SWAP_16_BYTES) + }, { .fn = pl110_draw_line1_lblp_rgb }, { .fn = pl110_draw_line2_lblp_rgb },