From nobody Wed Nov 19 10:13:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1615349622; cv=none; d=zohomail.com; s=zohoarc; b=dQClVov4iTMX0MF5kThQb0CSY9E6up7AlR/d3l7SNnEci7ohqv4DxpYHxy1K9707OyA2jNBFePh5xwL+DAknbS54s1ufWBSLo1Kf1GmbqYleestTczoXcU+YRZAwczths9VXqIh7czRvC9Ub8WUuBYmmjITLgRQerIJ1Cte8upc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615349621; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0g9DpnugvJi8n9pi8SrpMOVuP4C8o0FDm7Mi0Imm1w8=; b=jLSy9WjwSNgI+C9M/m92TiJuLjUVWjRgj/TGvOqq4A/vAtJfHzJRP8HE0OmAG1BVMKC6+RoJgEi8A5r4MtOsIQFTsI/LbhsZ5W/YegEjcqxUzGtehwigZDHz+2kOCbwlXY4uH2kXTnULB/rHoVwiNB8QJBZmA12yJMaUaHsAhtU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615349621987535.6701474485666; Tue, 9 Mar 2021 20:13:41 -0800 (PST) Received: from localhost ([::1]:47970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJqE8-0000be-Fe for importer@patchew.org; Tue, 09 Mar 2021 23:13:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJqAl-0003Tp-FM; Tue, 09 Mar 2021 23:10:13 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:56169 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJqAj-00046u-DP; Tue, 09 Mar 2021 23:10:11 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DwJWd15hVz9sS8; Wed, 10 Mar 2021 15:10:05 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1615349405; bh=Q6YsQnQ2NHBT3n+G/C9i0pub6lxo+cLVM7w8a9XTAsM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KGhojhca97gCNoft/CunYWbI1HFyiO2GvjHwWwMxIe1buWhbOcxS1sLIUJExNZUoN rrU5tDj0Gpja+qQxHlnB3b4tg0yWDzocTgNEzhttqFozcgaGLQi6UKIpUm+LBlvT8E QBRhHjCN7+mJpAlz3THAYHKCDrb4pLT6Balzh1Ok= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 01/20] hw/display/sm501: Remove dead code for non-32-bit RGB surfaces Date: Wed, 10 Mar 2021 15:09:43 +1100 Message-Id: <20210310041002.333813-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310041002.333813-1-david@gibson.dropbear.id.au> References: <20210310041002.333813-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Peter Maydell For a long time now the UI layer has guaranteed that the console surface is always 32 bits per pixel RGB. Remove the legacy dead code from the sm501 display device which was handling the possibility that the console surface was some other format. Signed-off-by: Peter Maydell Message-Id: <20210212180653.27588-2-peter.maydell@linaro.org> Acked-by: BALATON Zoltan Signed-off-by: David Gibson --- hw/display/sm501.c | 91 +++------------------------------------------- 1 file changed, 6 insertions(+), 85 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 8966b69bc7..aba447c18b 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -1558,89 +1558,9 @@ typedef void draw_hwc_line_func(uint8_t *d, const ui= nt8_t *s, int width, const uint8_t *palette, int c_x, int c_y); =20 -#define DEPTH 8 -#include "sm501_template.h" - -#define DEPTH 15 -#include "sm501_template.h" - -#define BGR_FORMAT -#define DEPTH 15 -#include "sm501_template.h" - -#define DEPTH 16 -#include "sm501_template.h" - -#define BGR_FORMAT -#define DEPTH 16 -#include "sm501_template.h" - #define DEPTH 32 #include "sm501_template.h" =20 -#define BGR_FORMAT -#define DEPTH 32 -#include "sm501_template.h" - -static draw_line_func *draw_line8_funcs[] =3D { - draw_line8_8, - draw_line8_15, - draw_line8_16, - draw_line8_32, - draw_line8_32bgr, - draw_line8_15bgr, - draw_line8_16bgr, -}; - -static draw_line_func *draw_line16_funcs[] =3D { - draw_line16_8, - draw_line16_15, - draw_line16_16, - draw_line16_32, - draw_line16_32bgr, - draw_line16_15bgr, - draw_line16_16bgr, -}; - -static draw_line_func *draw_line32_funcs[] =3D { - draw_line32_8, - draw_line32_15, - draw_line32_16, - draw_line32_32, - draw_line32_32bgr, - draw_line32_15bgr, - draw_line32_16bgr, -}; - -static draw_hwc_line_func *draw_hwc_line_funcs[] =3D { - draw_hwc_line_8, - draw_hwc_line_15, - draw_hwc_line_16, - draw_hwc_line_32, - draw_hwc_line_32bgr, - draw_hwc_line_15bgr, - draw_hwc_line_16bgr, -}; - -static inline int get_depth_index(DisplaySurface *surface) -{ - switch (surface_bits_per_pixel(surface)) { - default: - case 8: - return 0; - case 15: - return 1; - case 16: - return 2; - case 32: - if (is_surface_bgr(surface)) { - return 4; - } else { - return 3; - } - } -} - static void sm501_update_display(void *opaque) { SM501State *s =3D (SM501State *)opaque; @@ -1652,7 +1572,6 @@ static void sm501_update_display(void *opaque) int height =3D get_height(s, crt); int src_bpp =3D get_bpp(s, crt); int dst_bpp =3D surface_bytes_per_pixel(surface); - int dst_depth_index =3D get_depth_index(surface); draw_line_func *draw_line =3D NULL; draw_hwc_line_func *draw_hwc_line =3D NULL; int full_update =3D 0; @@ -1662,6 +1581,8 @@ static void sm501_update_display(void *opaque) uint8_t hwc_palette[3 * 3]; uint8_t *hwc_src =3D NULL; =20 + assert(dst_bpp =3D=3D 4); /* Output is always 32-bit RGB */ + if (!((crt ? s->dc_crt_control : s->dc_panel_control) & SM501_DC_CRT_CONTROL_ENABLE)) { return; @@ -1674,13 +1595,13 @@ static void sm501_update_display(void *opaque) /* choose draw_line function */ switch (src_bpp) { case 1: - draw_line =3D draw_line8_funcs[dst_depth_index]; + draw_line =3D draw_line8_32; break; case 2: - draw_line =3D draw_line16_funcs[dst_depth_index]; + draw_line =3D draw_line16_32; break; case 4: - draw_line =3D draw_line32_funcs[dst_depth_index]; + draw_line =3D draw_line32_32; break; default: qemu_log_mask(LOG_GUEST_ERROR, "sm501: update display" @@ -1691,7 +1612,7 @@ static void sm501_update_display(void *opaque) /* set up to draw hardware cursor */ if (is_hwc_enabled(s, crt)) { /* choose cursor draw line function */ - draw_hwc_line =3D draw_hwc_line_funcs[dst_depth_index]; + draw_hwc_line =3D draw_hwc_line_32; hwc_src =3D get_hwc_address(s, crt); c_x =3D get_hwc_x(s, crt); c_y =3D get_hwc_y(s, crt); --=20 2.29.2