From patchwork Mon Sep 18 13:52:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1836135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=dYh0IuE3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rq5qz2KTqz1ync for ; Mon, 18 Sep 2023 23:54:07 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEhB-0006To-3e; Mon, 18 Sep 2023 09:53:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgz-0006Nh-Kz for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgv-0000ht-St for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D6SI9rwd/TNwOZbdFKCphFrmp83f8MLrzIddIHTVG+Q=; b=dYh0IuE3AD1idOiJOBTiO5bB0TvKWvNlg7UZouOYvF48w3fAO4eJln8+2KC9wngMeOn1by SM4rdxDjE73buPxHy8z0WqIXEc2++TlkQSMB8i9ezsJZQmBzKgB5nI/0JiGlarHdiFA+0/ watTUEKOFb5pylcldyqOXl+cBfCi8NE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-656-s_gdSr4RMkWcxUKMs98kqg-1; Mon, 18 Sep 2023 09:53:21 -0400 X-MC-Unique: s_gdSr4RMkWcxUKMs98kqg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C52E945922; Mon, 18 Sep 2023 13:53:21 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9F3540C2064; Mon, 18 Sep 2023 13:53:19 +0000 (UTC) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , BALATON Zoltan , qemu-ppc@nongnu.org (open list:sam460ex) Subject: [PATCH v2 16/18] hw/sm501: allow compiling without PIXMAN Date: Mon, 18 Sep 2023 17:52:03 +0400 Message-ID: <20230918135206.2739222-17-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 From: Marc-André Lureau Drop the "x-pixman" property and use fallback path in such case. Signed-off-by: Marc-André Lureau Reviewed-by: BALATON Zoltan --- hw/display/sm501.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 0eecd00701..a897c82f04 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -730,7 +730,6 @@ static void sm501_2d_operation(SM501State *s) switch (cmd) { case 0: /* BitBlt */ { - static uint32_t tmp_buf[16384]; unsigned int src_x = (s->twoD_source >> 16) & 0x01FFF; unsigned int src_y = s->twoD_source & 0xFFFF; uint32_t src_base = s->twoD_source_base & 0x03FFFFFF; @@ -828,9 +827,11 @@ static void sm501_2d_operation(SM501State *s) de = db + (width + (height - 1) * dst_pitch) * bypp; overlap = (db < se && sb < de); } +#ifdef CONFIG_PIXMAN if (overlap && (s->use_pixman & BIT(2))) { /* pixman can't do reverse blit: copy via temporary */ int tmp_stride = DIV_ROUND_UP(width * bypp, sizeof(uint32_t)); + static uint32_t tmp_buf[16384]; uint32_t *tmp = tmp_buf; if (tmp_stride * sizeof(uint32_t) * height > sizeof(tmp_buf)) { @@ -860,9 +861,12 @@ static void sm501_2d_operation(SM501State *s) dst_pitch * bypp / sizeof(uint32_t), 8 * bypp, 8 * bypp, src_x, src_y, dst_x, dst_y, width, height); - } else { + } else +#else + { fallback = true; } +#endif if (fallback) { uint8_t *sp = s->local_mem + src_base; uint8_t *d = s->local_mem + dst_base; @@ -894,10 +898,13 @@ static void sm501_2d_operation(SM501State *s) color = cpu_to_le16(color); } +#ifdef CONFIG_PIXMAN if (!(s->use_pixman & BIT(0)) || (width == 1 && height == 1) || !pixman_fill((uint32_t *)&s->local_mem[dst_base], dst_pitch * bypp / sizeof(uint32_t), 8 * bypp, - dst_x, dst_y, width, height, color)) { + dst_x, dst_y, width, height, color)) +#endif + { /* fallback when pixman failed or we don't want to call it */ uint8_t *d = s->local_mem + dst_base; unsigned int x, y, i; @@ -2038,7 +2045,9 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp) static Property sm501_sysbus_properties[] = { DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0), +#ifdef CONFIG_PIXMAN DEFINE_PROP_UINT8("x-pixman", SM501SysBusState, state.use_pixman, 7), +#endif DEFINE_PROP_END_OF_LIST(), }; @@ -2126,7 +2135,9 @@ static void sm501_realize_pci(PCIDevice *dev, Error **errp) static Property sm501_pci_properties[] = { DEFINE_PROP_UINT32("vram-size", SM501PCIState, vram_size, 64 * MiB), +#ifdef CONFIG_PIXMAN DEFINE_PROP_UINT8("x-pixman", SM501PCIState, state.use_pixman, 7), +#endif DEFINE_PROP_END_OF_LIST(), }; @@ -2169,8 +2180,10 @@ static void sm501_pci_class_init(ObjectClass *klass, void *data) static void sm501_pci_init(Object *o) { +#ifdef CONFIG_PIXMAN object_property_set_description(o, "x-pixman", "Use pixman for: " "1: fill, 2: blit, 4: overlap blit"); +#endif } static const TypeInfo sm501_pci_info = {