From nobody Sun Nov 16 04:52:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1592267911; cv=none; d=zohomail.com; s=zohoarc; b=j0/Ao+WQhYX5sBEuOUzc2+XAGw0K2ufLyR3gxL+6Nsslrl106Fz4P/ZeL4w3If7UZg4OGmZFBYga86BYXy8JKVgZtaok9N8/F0+P1XttCOSHcOy7piPDFUzd5u/jn8SKs+m887pAuDhwxgzAGYYSxbPMvfppWNU+U+TC+kDJWNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592267911; h=Content-Type: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=Gk0yDx3FJLF/mJilbuLA3D63Us+pHDApZ6txsBT9wm4=; b=nk5hdp0EVUW6d/DiK3q96aSdn6fXbkb7ZTCXETwo3hwU60JS/FnYZu+0AoMeaSDr98WEYSQYb9R9EyEzFoxJY9qju2JMzUeH2DrIzJNDFTe0ydPMRL9gM2xCpfQEGsJaQ7LCE/Z/zvpNY+OFRgRqoXJUt1IbcPUwIkKiNZMdNnk= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1592267911902450.3384815687989; Mon, 15 Jun 2020 17:38:31 -0700 (PDT) Received: from localhost ([::1]:40098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkzcU-0000ZD-NN for importer@patchew.org; Mon, 15 Jun 2020 20:38:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZr-0004d1-P7 for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:47 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:46188) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZn-0003tf-SW for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:47 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id D9B57748DDA; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 5FA1374633E; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 1/8] sm501: Fix bounds checks Date: Tue, 16 Jun 2020 02:22:30 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org X-Spam-Probability: 8% 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=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 20:35:40 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , Sebastian Bauer , Magnus Damm , Gerd Hoffmann , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We don't need to add width to pitch when calculating last point, that would reject valid ops within the card's local_mem. Fixes: b15a22bbcbe6a78dc3d88fe3134985e4cdd87de4 Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell --- hw/display/sm501.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index edd8d24a76..5ae320ddc3 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -723,8 +723,8 @@ static void sm501_2d_operation(SM501State *s) dst_y -=3D height - 1; } =20 - if (dst_base >=3D get_local_mem_size(s) || dst_base + - (dst_x + width + (dst_y + height) * (dst_pitch + width)) * + if (dst_base >=3D get_local_mem_size(s) || + dst_base + (dst_x + width + (dst_y + height) * dst_pitch) * (1 << format) >=3D get_local_mem_size(s)) { qemu_log_mask(LOG_GUEST_ERROR, "sm501: 2D op dest is outside vram.= \n"); return; @@ -749,8 +749,8 @@ static void sm501_2d_operation(SM501State *s) src_y -=3D height - 1; } =20 - if (src_base >=3D get_local_mem_size(s) || src_base + - (src_x + width + (src_y + height) * (src_pitch + width)) * + if (src_base >=3D get_local_mem_size(s) || + src_base + (src_x + width + (src_y + height) * src_pitch) * (1 << format) >=3D get_local_mem_size(s)) { qemu_log_mask(LOG_GUEST_ERROR, "sm501: 2D op src is outside vram.\n"); --=20 2.21.3 From nobody Sun Nov 16 04:52:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1592267911; cv=none; d=zohomail.com; s=zohoarc; b=l0JyGiAtuMTlqrEGdehCMTmTHyIylefy1umbsH2ydjbQrK6p/ANiK/pZrqE7hofq594Tt1vcmKD6j40vNWnVLg2OycV2lQFD4V+eH3d89WMgXkezj7F1cCsP3A9g2aphHITrR5OESx2HKPckpULeXHzXvJcaJBhDwrJYTeBDI/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592267911; h=Content-Type: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=nDd0rBgNWfrndO3O5au+1Dh/aSPuiQbtD9eLNsWjZTY=; b=bwBYq+W+CfGOUhcAWUScg1M7b9CSukCBlmhhF8DwdtT01kD6NFE9jadVn7OJeIsoPM/kFDhMfzLVd64Nu+cxCR2ikhAlKf3Bd0mHTyjZYRZAooF8oUsGDb7NEg07NWci0QCvnf6PmxnrEsQHr2bpitKu+LN5wzc7V+fztq3wqH8= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1592267911284358.2313814010788; Mon, 15 Jun 2020 17:38:31 -0700 (PDT) Received: from localhost ([::1]:40064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkzcU-0000YM-2p for importer@patchew.org; Mon, 15 Jun 2020 20:38:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZq-0004ch-Vy for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:47 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:46195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZo-0003tm-Eo for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:46 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id DC936748DDB; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 641EB7475F9; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Message-Id: <2a2556cc2394573dde9d3307b931aa741f37e7d6.1592266950.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 2/8] sm501: Drop unneded variable Date: Tue, 16 Jun 2020 02:22:30 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org X-Spam-Probability: 8% 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=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , Sebastian Bauer , Magnus Damm , Gerd Hoffmann , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We don't need a separate variable to keep track if we allocated memory that needs to be freed as we can test the pointer itself. Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell --- hw/display/sm501.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 5ae320ddc3..85d54b598f 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -796,13 +796,12 @@ static void sm501_2d_operation(SM501State *s) de =3D db + width + height * (width + dst_pitch); if (rtl && ((db >=3D sb && db <=3D se) || (de >=3D sb && de <= =3D se))) { /* regions may overlap: copy via temporary */ - int free_buf =3D 0, llb =3D width * (1 << format); + int llb =3D width * (1 << format); int tmp_stride =3D DIV_ROUND_UP(llb, sizeof(uint32_t)); uint32_t *tmp =3D tmp_buf; =20 if (tmp_stride * sizeof(uint32_t) * height > sizeof(tmp_bu= f)) { tmp =3D g_malloc(tmp_stride * sizeof(uint32_t) * heigh= t); - free_buf =3D 1; } pixman_blt((uint32_t *)&s->local_mem[src_base], tmp, src_pitch * (1 << format) / sizeof(uint32_t), @@ -813,7 +812,7 @@ static void sm501_2d_operation(SM501State *s) dst_pitch * (1 << format) / sizeof(uint32_t), 8 * (1 << format), 8 * (1 << format), 0, 0, dst_x, dst_y, width, height); - if (free_buf) { + if (tmp !=3D tmp_buf) { g_free(tmp); } } else { --=20 2.21.3 From nobody Sun Nov 16 04:52:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1592268066; cv=none; d=zohomail.com; s=zohoarc; b=fJpKfH1T9RxGezj2lBhICLcfuQ8iKsiNbzKAQs+jRQmO1wgnSSLL9KPIBV8WCbj9eiB9PPDepoOy4hOWL3I0p8KZN2KNdAF70p0QuXeo33trIJ8omflJk82ycXjDxNmDz6wLWD8Tvr5p/Q2Is4IhRniGk7TZjb94XiGhND9BNCo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592268066; h=Content-Type: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=zxB7RwSaVVtFyWeEqTqCs/d6G23scsvXBunnaTU0OR4=; b=YncA33uJ0AVMJeoH5uROT1Ekvidvnjs6kttUiTfAnydE2vLjK7+zS0ZnkfLValuEwWPVGBVi8QLGNFwhgAxwIoeE5ErFg3uvoqUxcT8VfNUv+43osCuRkanTiNVLwSebdE25UflpDYSBaUb4Z0ARfwyxXoSV/um0uvsYlVjUQJ0= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1592268066379823.2326955929198; Mon, 15 Jun 2020 17:41:06 -0700 (PDT) Received: from localhost ([::1]:47674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkzez-0003qz-7G for importer@patchew.org; Mon, 15 Jun 2020 20:41:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZu-0004fH-TU for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:51 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:46224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZr-0003ye-NL for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:50 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id DDFA0748DDC; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 689A37482C8; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 3/8] sm501: Ignore no-op blits Date: Tue, 16 Jun 2020 02:22:30 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org X-Spam-Probability: 8% 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=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 20:35:40 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , Sebastian Bauer , Magnus Damm , Gerd Hoffmann , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Some guests seem to try source copy blits with same source and dest which are no-op so avoid calling pixman for these. Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell --- hw/display/sm501.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 85d54b598f..3397ca9fbf 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -788,6 +788,11 @@ static void sm501_2d_operation(SM501State *s) (rop2_source_is_pattern ? " with pattern source" : "")); } + /* Ignore no-op blits, some guests seem to do this */ + if (src_base =3D=3D dst_base && src_pitch =3D=3D dst_pitch && + src_x =3D=3D dst_x && src_y =3D=3D dst_y) { + break; + } /* Check for overlaps, this could be made more exact */ uint32_t sb, se, db, de; sb =3D src_base + src_x + src_y * (width + src_pitch); --=20 2.21.3 From nobody Sun Nov 16 04:52:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1592267821; cv=none; d=zohomail.com; s=zohoarc; b=jyFyDOc2sPGu1BmB8AVVXNV6SE6d4BHOCHLfKOrwIJHkWKt3t9SURPUnMSoFgutJ6aoj9vf24t5TRg2bw3j0mHoOSAFeA4OnuDwdHw9rbshLTW39jhj1sc3alRlBtA8LLWrMxH1HLauwq5EQeKuf975Owb8W3ueGLdZW9ICL168= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592267821; h=Content-Type: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=0CN3/Q0nuWlua9fM0ltPpd/K6oWc+TgWCF+lgGY3npA=; b=Uxvemgq8eQVE98XJ6//QXDu1kfQeLAhL3uNEF2UfIYppUMfZuoz/+IDD/IUDj9oukjW8hLmNDQ80tL7bhJC5xC2EXKZuFXlCjUP6vAGEO2nmf+/4ulGMTSaiMxL0EhfaJU/Y9Yw4CGR7b/lPwb6XlneYGf1lgRdKebnb+EcJmr0= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1592267821796834.6443415764462; Mon, 15 Jun 2020 17:37:01 -0700 (PDT) Received: from localhost ([::1]:33488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkzb2-0006Hd-A3 for importer@patchew.org; Mon, 15 Jun 2020 20:37:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZr-0004cy-I6 for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:47 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:46185) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZn-0003td-Mt for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:47 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id C585E748DD0; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 6C4DE7482CE; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Message-Id: <728903de06f672d4afc9c29827c246027860bfb8.1592266950.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 4/8] sm501: Introduce variable for commonly used value for better readability Date: Tue, 16 Jun 2020 02:22:30 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org X-Spam-Probability: 8% 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=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 20:35:40 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , Sebastian Bauer , Magnus Damm , Gerd Hoffmann , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The bytes per pixel value can be calculated from format but it's used freqently enough (and will be used more in subseqent patches) so store it in a variable for better readabilty. Also drop some unneded 0x prefix around where new variable is defined. Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell --- hw/display/sm501.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 3397ca9fbf..282574adec 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -684,10 +684,11 @@ static void sm501_2d_operation(SM501State *s) { int cmd =3D (s->twoD_control >> 16) & 0x1F; int rtl =3D s->twoD_control & BIT(27); - int format =3D (s->twoD_stretch >> 20) & 0x3; - int rop_mode =3D (s->twoD_control >> 15) & 0x1; /* 1 for rop2, else ro= p3 */ + int format =3D (s->twoD_stretch >> 20) & 3; + int bypp =3D 1 << format; /* bytes per pixel */ + int rop_mode =3D (s->twoD_control >> 15) & 1; /* 1 for rop2, else rop3= */ /* 1 if rop2 source is the pattern, otherwise the source is the bitmap= */ - int rop2_source_is_pattern =3D (s->twoD_control >> 14) & 0x1; + int rop2_source_is_pattern =3D (s->twoD_control >> 14) & 1; int rop =3D s->twoD_control & 0xFF; unsigned int dst_x =3D (s->twoD_destination >> 16) & 0x01FFF; unsigned int dst_y =3D s->twoD_destination & 0xFFFF; @@ -724,8 +725,8 @@ static void sm501_2d_operation(SM501State *s) } =20 if (dst_base >=3D get_local_mem_size(s) || - dst_base + (dst_x + width + (dst_y + height) * dst_pitch) * - (1 << format) >=3D get_local_mem_size(s)) { + dst_base + (dst_x + width + (dst_y + height) * dst_pitch) * bypp >= =3D + get_local_mem_size(s)) { qemu_log_mask(LOG_GUEST_ERROR, "sm501: 2D op dest is outside vram.= \n"); return; } @@ -750,8 +751,8 @@ static void sm501_2d_operation(SM501State *s) } =20 if (src_base >=3D get_local_mem_size(s) || - src_base + (src_x + width + (src_y + height) * src_pitch) * - (1 << format) >=3D get_local_mem_size(s)) { + src_base + (src_x + width + (src_y + height) * src_pitch) * by= pp >=3D + get_local_mem_size(s)) { qemu_log_mask(LOG_GUEST_ERROR, "sm501: 2D op src is outside vram.\n"); return; @@ -763,8 +764,8 @@ static void sm501_2d_operation(SM501State *s) uint8_t *d =3D s->local_mem + dst_base; =20 for (y =3D 0; y < height; y++) { - i =3D (dst_x + (dst_y + y) * dst_pitch) * (1 << format); - for (x =3D 0; x < width; x++, i +=3D (1 << format)) { + i =3D (dst_x + (dst_y + y) * dst_pitch) * bypp; + for (x =3D 0; x < width; x++, i +=3D bypp) { switch (format) { case 0: d[i] =3D ~d[i]; @@ -801,7 +802,7 @@ static void sm501_2d_operation(SM501State *s) de =3D db + width + height * (width + dst_pitch); if (rtl && ((db >=3D sb && db <=3D se) || (de >=3D sb && de <= =3D se))) { /* regions may overlap: copy via temporary */ - int llb =3D width * (1 << format); + int llb =3D width * bypp; int tmp_stride =3D DIV_ROUND_UP(llb, sizeof(uint32_t)); uint32_t *tmp =3D tmp_buf; =20 @@ -809,13 +810,13 @@ static void sm501_2d_operation(SM501State *s) tmp =3D g_malloc(tmp_stride * sizeof(uint32_t) * heigh= t); } pixman_blt((uint32_t *)&s->local_mem[src_base], tmp, - src_pitch * (1 << format) / sizeof(uint32_t), - tmp_stride, 8 * (1 << format), 8 * (1 << format= ), + src_pitch * bypp / sizeof(uint32_t), + tmp_stride, 8 * bypp, 8 * bypp, src_x, src_y, 0, 0, width, height); pixman_blt(tmp, (uint32_t *)&s->local_mem[dst_base], tmp_stride, - dst_pitch * (1 << format) / sizeof(uint32_t), - 8 * (1 << format), 8 * (1 << format), + dst_pitch * bypp / sizeof(uint32_t), + 8 * bypp, 8 * bypp, 0, 0, dst_x, dst_y, width, height); if (tmp !=3D tmp_buf) { g_free(tmp); @@ -823,9 +824,9 @@ static void sm501_2d_operation(SM501State *s) } else { pixman_blt((uint32_t *)&s->local_mem[src_base], (uint32_t *)&s->local_mem[dst_base], - src_pitch * (1 << format) / sizeof(uint32_t), - dst_pitch * (1 << format) / sizeof(uint32_t), - 8 * (1 << format), 8 * (1 << format), + src_pitch * bypp / sizeof(uint32_t), + dst_pitch * bypp / sizeof(uint32_t), + 8 * bypp, 8 * bypp, src_x, src_y, dst_x, dst_y, width, height); } } @@ -842,8 +843,8 @@ static void sm501_2d_operation(SM501State *s) } =20 pixman_fill((uint32_t *)&s->local_mem[dst_base], - dst_pitch * (1 << format) / sizeof(uint32_t), - 8 * (1 << format), dst_x, dst_y, width, height, color); + dst_pitch * bypp / sizeof(uint32_t), + 8 * bypp, dst_x, dst_y, width, height, color); break; } default: @@ -855,7 +856,7 @@ static void sm501_2d_operation(SM501State *s) if (dst_base >=3D get_fb_addr(s, crt) && dst_base <=3D get_fb_addr(s, crt) + fb_len) { int dst_len =3D MIN(fb_len, ((dst_y + height - 1) * dst_pitch + - dst_x + width) * (1 << format)); + dst_x + width) * bypp); if (dst_len) { memory_region_set_dirty(&s->local_mem_region, dst_base, dst_le= n); } --=20 2.21.3 From nobody Sun Nov 16 04:52:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1592267821; cv=none; d=zohomail.com; s=zohoarc; b=daevSbgmg71VlDc0p8H2WtPssliSTioeh2TIZIBVdDq6XUM7yFK0VmuX2KQM4ek9k5RWD9+9aFkm6yk5A2/dFOWJ1R7vqVw2B5+eQENqtiA3lCSRmHQqwwIlD7aUOVJlfqfJSMuurz7wWwg9shSnaqruDUE2TFffYpxvGZC3fzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592267821; h=Content-Type: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=zwc9aC6ub2LHyZSPsuRkKnZ6sIzgLrsxKyr9RnRQr+8=; b=KcwxD0iqOxhchUkITdoZiWwf0HIqyFtHNnOct0O9wEm+r0JHoKXRWxOrNtrFbeKWC7YztCvyiHHpIiadzrmUQ8FzwvrozohDa3Hx52jK9GAy30wQKSdpHszGJBoYrBhzTPSJnwXxGd0ws8tyi2HqrM8lhLBxExDpIYmn20TZIkI= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1592267821919502.84874769252895; Mon, 15 Jun 2020 17:37:01 -0700 (PDT) Received: from localhost ([::1]:33514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkzb2-0006IO-FE for importer@patchew.org; Mon, 15 Jun 2020 20:37:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZr-0004ci-03 for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:47 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:46200) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZn-0003tn-Mq for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:46 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id E433D748DDD; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 704CA748DC8; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Message-Id: <08998af9ba98092b7df53b8c759010bee6206261.1592266950.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 5/8] sm501: Optimise 1 pixel 2d ops Date: Tue, 16 Jun 2020 02:22:30 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org X-Spam-Probability: 8% 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=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 20:35:40 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , Sebastian Bauer , Magnus Damm , Gerd Hoffmann , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Some guests do 1x1 blits which is faster to do directly than calling a function for it so avoid overhead in this case. Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell --- 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 282574adec..b6356ea1ee 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -794,6 +794,14 @@ static void sm501_2d_operation(SM501State *s) src_x =3D=3D dst_x && src_y =3D=3D dst_y) { break; } + /* Some clients also do 1 pixel blits, avoid overhead for thes= e */ + if (width =3D=3D 1 && height =3D=3D 1) { + unsigned int si =3D (src_x + src_y * src_pitch) * bypp; + unsigned int di =3D (dst_x + dst_y * dst_pitch) * bypp; + stn_he_p(&s->local_mem[dst_base + di], bypp, + ldn_he_p(&s->local_mem[src_base + si], bypp)); + break; + } /* Check for overlaps, this could be made more exact */ uint32_t sb, se, db, de; sb =3D src_base + src_x + src_y * (width + src_pitch); @@ -842,9 +850,14 @@ static void sm501_2d_operation(SM501State *s) color =3D cpu_to_le16(color); } =20 - pixman_fill((uint32_t *)&s->local_mem[dst_base], - dst_pitch * bypp / sizeof(uint32_t), - 8 * bypp, dst_x, dst_y, width, height, color); + if (width =3D=3D 1 && height =3D=3D 1) { + unsigned int i =3D (dst_x + dst_y * dst_pitch) * bypp; + stn_he_p(&s->local_mem[dst_base + i], bypp, color); + } else { + pixman_fill((uint32_t *)&s->local_mem[dst_base], + dst_pitch * bypp / sizeof(uint32_t), + 8 * bypp, dst_x, dst_y, width, height, color); + } break; } default: --=20 2.21.3 From nobody Sun Nov 16 04:52:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1592267999; cv=none; d=zohomail.com; s=zohoarc; b=UJM1PJqhfDBtzOvdF1dhspybaRxyAu7Dg1QOL2USy1D2ZeLKxXbU0rZ5doy8oKFl8O9REx1mvihOBkTEN8BkMayVN5aXJi09sOTWSzCcyX8W/nyByBXoxridi5uHZu9D8PG/dTW8HToXlFIZdT7ZTbeEv0aGDNUvm726HmM3a8Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592267999; h=Content-Type: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=yzlKRcyoS6psVtm2OFtFezLSxz+IUZQ6h7GMxVWfrSk=; b=dElytrRNtQcPMh3djrHyyV9jWVcpvdRQ60CzEgjIdhakuMOQ0RI/uTaLTsw54BM9ybYjyo1WylH+MJUyXXg/heHS1rPR05q9WUJJHf2DQ+R7/lKhVv1r1EDtOD2RVIWNNM9U0EBLpTnUc3+yR6FseWG8JuUR4wwtJzVM8KkxGOA= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1592267999665466.2772007571682; Mon, 15 Jun 2020 17:39:59 -0700 (PDT) Received: from localhost ([::1]:44320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkzdu-0002If-Cj for importer@patchew.org; Mon, 15 Jun 2020 20:39:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZu-0004fB-Fv for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:51 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:46225) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZr-0003z1-J5 for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:50 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 051CA748DDF; Tue, 16 Jun 2020 02:35:41 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 7600C748DCF; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Message-Id: <59fd9656e72cd56e6dcd3c9ffc04ff91f8b3d907.1592266950.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 6/8] sm501: Use stn_he_p/ldn_he_p instead of switch/case Date: Tue, 16 Jun 2020 02:22:30 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org X-Spam-Probability: 8% 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=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , Sebastian Bauer , Magnus Damm , Gerd Hoffmann , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Instead of open coding op with different sizes using a switch and type casting it can be written more compactly using stn_he_p/ldn_he_p. Suggested-by: Peter Maydell Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/sm501.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index b6356ea1ee..6e914d3162 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -766,17 +766,7 @@ static void sm501_2d_operation(SM501State *s) for (y =3D 0; y < height; y++) { i =3D (dst_x + (dst_y + y) * dst_pitch) * bypp; for (x =3D 0; x < width; x++, i +=3D bypp) { - switch (format) { - case 0: - d[i] =3D ~d[i]; - break; - case 1: - *(uint16_t *)&d[i] =3D ~*(uint16_t *)&d[i]; - break; - case 2: - *(uint32_t *)&d[i] =3D ~*(uint32_t *)&d[i]; - break; - } + stn_he_p(&d[i], bypp, ~ldn_he_p(&d[i], bypp)); } } } else { --=20 2.21.3 From nobody Sun Nov 16 04:52:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1592267823; cv=none; d=zohomail.com; s=zohoarc; b=L1iJUDVcTT+wOcRAaNXa53rx8u+i6S5fVO2sEiR5YmUkIOIdBFMHUZuWW8aoxLZJbxkuOaJ8UAYGOVsPWzw0vGcuYvtNdkcVxkQfxoFDPvDnZVi9647T+64QkmljB7hK39APLiquR7oL0bDFpBnfzOAM7MWNyL5ddG+gA/R4qxQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592267823; h=Content-Type: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=YHVWgF2XycC82xxG17PyFsANjQPeukK0CyFHqv/m9ps=; b=U7m1jkWskGsPfYWlNqBfB8XwdfKmeE1fM5/yTVx42y8FJQNFvgWnT/UhpRq7FqtTjL3nl2LRfxpuNyWd0H+WP0f4IPRGLS46AR5Xj0zcdbKcGWoI6MMXHKli0I+O7J63Bf3/JtyKXLzAB/m+zyjiDeu8Q0cQAi/PPqie7chyMXU= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 159226782363944.23061860703001; Mon, 15 Jun 2020 17:37:03 -0700 (PDT) Received: from localhost ([::1]:33788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkzb4-0006QO-7a for importer@patchew.org; Mon, 15 Jun 2020 20:37:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZt-0004eT-Ih for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:49 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:46223) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZr-0003yd-CQ for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:49 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 0397C748DDE; Tue, 16 Jun 2020 02:35:41 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 78C37748DD1; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Message-Id: <40f83f54bd3a4aad12212bbcd73d5466451df38a.1592266950.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 7/8] sm501: Do not allow guest to set invalid format Date: Tue, 16 Jun 2020 02:22:30 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org X-Spam-Probability: 8% 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=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , Sebastian Bauer , Magnus Damm , Gerd Hoffmann , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Prevent guest setting invalid format value that might trip checks in sm501_2d_operation(). Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell --- hw/display/sm501.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 6e914d3162..583a0ff6b5 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -1503,6 +1503,9 @@ static void sm501_2d_engine_write(void *opaque, hwadd= r addr, s->twoD_background =3D value; break; case SM501_2D_STRETCH: + if (((value >> 20) & 3) =3D=3D 3) { + value &=3D ~BIT(20); + } s->twoD_stretch =3D value; break; case SM501_2D_COLOR_COMPARE: --=20 2.21.3 From nobody Sun Nov 16 04:52:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1592268141; cv=none; d=zohomail.com; s=zohoarc; b=cNQjDT450U8FLpVRTmRf+77Rq0Wb5mU6/qlcqqYrZeioUiztdSBfBJebMQv0dWZ/ysfff+yMtdvXB+46sJTaAmyo9g1s3d1Z6+XMWxvgyQfVsVn1N/g8GDd8Y7+dy3bHiXW55LDHcnzbre7sNAgbq7OneHl81H3DHQZ7jZDbaYI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592268141; h=Content-Type: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=NfaY5bpUE0Y8SUotctUIvVl+3lIPDfZgiPBcUr0v5L4=; b=LNy5A29pd0hN9rD13yzBj4FPxLtCautD5g2h8CWGTlkIEpGEOSGfDYoPLHMyODtC9WHr+21GYddQnGgYunO+U+x6jjitiMB9OTWUeh8xd+i9ZRN7O44NYpwhXxgEXB+9LjC7docEpWbsXQ6I5KqN+1bHnma6cZr1mAlHjr0WdOU= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1592268141931530.176327939859; Mon, 15 Jun 2020 17:42:21 -0700 (PDT) Received: from localhost ([::1]:49950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkzgC-0004oW-Bp for importer@patchew.org; Mon, 15 Jun 2020 20:42:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZv-0004fI-7j for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:51 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:46226) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkzZr-0003z0-Ic for qemu-devel@nongnu.org; Mon, 15 Jun 2020 20:35:50 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 218C8748DE0; Tue, 16 Jun 2020 02:35:41 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 7CA94748DCB; Tue, 16 Jun 2020 02:35:40 +0200 (CEST) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 8/8] sm501: Convert debug printfs to traces Date: Tue, 16 Jun 2020 02:22:30 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org X-Spam-Probability: 8% 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=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , Sebastian Bauer , Magnus Damm , Gerd Hoffmann , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell --- hw/display/sm501.c | 50 +++++++++++------------------------------ hw/display/trace-events | 12 ++++++++++ 2 files changed, 25 insertions(+), 37 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 583a0ff6b5..abe75f21dc 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -39,15 +39,7 @@ #include "qemu/range.h" #include "ui/pixel_ops.h" #include "qemu/bswap.h" - -/*#define DEBUG_SM501*/ -/*#define DEBUG_BITBLT*/ - -#ifdef DEBUG_SM501 -#define SM501_DPRINTF(fmt, ...) printf(fmt, ## __VA_ARGS__) -#else -#define SM501_DPRINTF(fmt, ...) do {} while (0) -#endif +#include "trace.h" =20 #define MMIO_BASE_OFFSET 0x3e00000 #define MMIO_SIZE 0x200000 @@ -871,7 +863,6 @@ static uint64_t sm501_system_config_read(void *opaque, = hwaddr addr, { SM501State *s =3D (SM501State *)opaque; uint32_t ret =3D 0; - SM501_DPRINTF("sm501 system config regs : read addr=3D%x\n", (int)addr= ); =20 switch (addr) { case SM501_SYSTEM_CONTROL: @@ -923,7 +914,7 @@ static uint64_t sm501_system_config_read(void *opaque, = hwaddr addr, qemu_log_mask(LOG_UNIMP, "sm501: not implemented system config" "register read. addr=3D%" HWADDR_PRIx "\n", addr); } - + trace_sm501_system_config_read(addr, ret); return ret; } =20 @@ -931,9 +922,8 @@ static void sm501_system_config_write(void *opaque, hwa= ddr addr, uint64_t value, unsigned size) { SM501State *s =3D (SM501State *)opaque; - SM501_DPRINTF("sm501 system config regs : write addr=3D%x, val=3D%x\n", - (uint32_t)addr, (uint32_t)value); =20 + trace_sm501_system_config_write((uint32_t)addr, (uint32_t)value); switch (addr) { case SM501_SYSTEM_CONTROL: s->system_control &=3D 0x10DB0000; @@ -1019,9 +1009,7 @@ static uint64_t sm501_i2c_read(void *opaque, hwaddr a= ddr, unsigned size) qemu_log_mask(LOG_UNIMP, "sm501 i2c : not implemented register rea= d." " addr=3D0x%" HWADDR_PRIx "\n", addr); } - - SM501_DPRINTF("sm501 i2c regs : read addr=3D%" HWADDR_PRIx " val=3D%x\= n", - addr, ret); + trace_sm501_i2c_read((uint32_t)addr, ret); return ret; } =20 @@ -1029,9 +1017,8 @@ static void sm501_i2c_write(void *opaque, hwaddr addr= , uint64_t value, unsigned size) { SM501State *s =3D (SM501State *)opaque; - SM501_DPRINTF("sm501 i2c regs : write addr=3D%" HWADDR_PRIx - " val=3D%" PRIx64 "\n", addr, value); =20 + trace_sm501_i2c_write((uint32_t)addr, (uint32_t)value); switch (addr) { case SM501_I2C_BYTE_COUNT: s->i2c_byte_count =3D value & 0xf; @@ -1045,25 +1032,19 @@ static void sm501_i2c_write(void *opaque, hwaddr ad= dr, uint64_t value, s->i2c_status |=3D (res ? SM501_I2C_STATUS_ERROR : 0); if (!res) { int i; - SM501_DPRINTF("sm501 i2c : transferring %d bytes to 0x= %x\n", - s->i2c_byte_count + 1, s->i2c_addr >> 1); for (i =3D 0; i <=3D s->i2c_byte_count; i++) { res =3D i2c_send_recv(s->i2c_bus, &s->i2c_data[i], !(s->i2c_addr & 1)); if (res) { - SM501_DPRINTF("sm501 i2c : transfer failed" - " i=3D%d, res=3D%d\n", i, res); s->i2c_status |=3D SM501_I2C_STATUS_ERROR; return; } } if (i) { - SM501_DPRINTF("sm501 i2c : transferred %d bytes\n"= , i); s->i2c_status =3D SM501_I2C_STATUS_COMPLETE; } } } else { - SM501_DPRINTF("sm501 i2c : end transfer\n"); i2c_end_transfer(s->i2c_bus); s->i2c_status &=3D ~SM501_I2C_STATUS_ERROR; } @@ -1103,7 +1084,8 @@ static const MemoryRegionOps sm501_i2c_ops =3D { static uint32_t sm501_palette_read(void *opaque, hwaddr addr) { SM501State *s =3D (SM501State *)opaque; - SM501_DPRINTF("sm501 palette read addr=3D%x\n", (int)addr); + + trace_sm501_palette_read((uint32_t)addr); =20 /* TODO : consider BYTE/WORD access */ /* TODO : consider endian */ @@ -1116,8 +1098,8 @@ static void sm501_palette_write(void *opaque, hwaddr = addr, uint32_t value) { SM501State *s =3D (SM501State *)opaque; - SM501_DPRINTF("sm501 palette write addr=3D%x, val=3D%x\n", - (int)addr, value); + + trace_sm501_palette_write((uint32_t)addr, value); =20 /* TODO : consider BYTE/WORD access */ /* TODO : consider endian */ @@ -1132,7 +1114,6 @@ static uint64_t sm501_disp_ctrl_read(void *opaque, hw= addr addr, { SM501State *s =3D (SM501State *)opaque; uint32_t ret =3D 0; - SM501_DPRINTF("sm501 disp ctrl regs : read addr=3D%x\n", (int)addr); =20 switch (addr) { =20 @@ -1237,7 +1218,7 @@ static uint64_t sm501_disp_ctrl_read(void *opaque, hw= addr addr, qemu_log_mask(LOG_UNIMP, "sm501: not implemented disp ctrl registe= r " "read. addr=3D%" HWADDR_PRIx "\n", addr); } - + trace_sm501_disp_ctrl_read((uint32_t)addr, ret); return ret; } =20 @@ -1245,9 +1226,8 @@ static void sm501_disp_ctrl_write(void *opaque, hwadd= r addr, uint64_t value, unsigned size) { SM501State *s =3D (SM501State *)opaque; - SM501_DPRINTF("sm501 disp ctrl regs : write addr=3D%x, val=3D%x\n", - (unsigned)addr, (unsigned)value); =20 + trace_sm501_disp_ctrl_write((uint32_t)addr, (uint32_t)value); switch (addr) { case SM501_DC_PANEL_CONTROL: s->dc_panel_control =3D value & 0x0FFF73FF; @@ -1392,7 +1372,6 @@ static uint64_t sm501_2d_engine_read(void *opaque, hw= addr addr, { SM501State *s =3D (SM501State *)opaque; uint32_t ret =3D 0; - SM501_DPRINTF("sm501 2d engine regs : read addr=3D%x\n", (int)addr); =20 switch (addr) { case SM501_2D_SOURCE: @@ -1462,7 +1441,7 @@ static uint64_t sm501_2d_engine_read(void *opaque, hw= addr addr, qemu_log_mask(LOG_UNIMP, "sm501: not implemented disp ctrl registe= r " "read. addr=3D%" HWADDR_PRIx "\n", addr); } - + trace_sm501_2d_engine_read((uint32_t)addr, ret); return ret; } =20 @@ -1470,9 +1449,8 @@ static void sm501_2d_engine_write(void *opaque, hwadd= r addr, uint64_t value, unsigned size) { SM501State *s =3D (SM501State *)opaque; - SM501_DPRINTF("sm501 2d engine regs : write addr=3D%x, val=3D%x\n", - (unsigned)addr, (unsigned)value); =20 + trace_sm501_2d_engine_write((uint32_t)addr, (uint32_t)value); switch (addr) { case SM501_2D_SOURCE: s->twoD_source =3D value; @@ -1830,8 +1808,6 @@ static void sm501_init(SM501State *s, DeviceState *de= v, uint32_t local_mem_bytes) { s->local_mem_size_index =3D get_local_mem_size_index(local_mem_bytes); - SM501_DPRINTF("sm501 local mem size=3D%x. index=3D%d\n", get_local_mem= _size(s), - s->local_mem_size_index); =20 /* local memory */ memory_region_init_ram(&s->local_mem_region, OBJECT(dev), "sm501.local= ", diff --git a/hw/display/trace-events b/hw/display/trace-events index 72d4c9812c..970d6bac5d 100644 --- a/hw/display/trace-events +++ b/hw/display/trace-events @@ -161,3 +161,15 @@ cg3_write(uint32_t addr, uint32_t val, unsigned size) = "write addr:0x%06"PRIx32" # dpcd.c dpcd_read(uint32_t addr, uint8_t val) "read addr:0x%"PRIx32" val:0x%02x" dpcd_write(uint32_t addr, uint8_t val) "write addr:0x%"PRIx32" val:0x%02x" + +# sm501.c +sm501_system_config_read(uint32_t addr, uint32_t val) "addr=3D0x%x, val=3D= 0x%x" +sm501_system_config_write(uint32_t addr, uint32_t val) "addr=3D0x%x, val= =3D0x%x" +sm501_i2c_read(uint32_t addr, uint8_t val) "addr=3D0x%x, val=3D0x%x" +sm501_i2c_write(uint32_t addr, uint32_t val) "addr=3D0x%x, val=3D0x%x" +sm501_palette_read(uint32_t addr) "addr=3D0x%x" +sm501_palette_write(uint32_t addr, uint32_t val) "addr=3D0x%x, val=3D0x%x" +sm501_disp_ctrl_read(uint32_t addr, uint32_t val) "addr=3D0x%x, val=3D0x%x" +sm501_disp_ctrl_write(uint32_t addr, uint32_t val) "addr=3D0x%x, val=3D0x%= x" +sm501_2d_engine_read(uint32_t addr, uint32_t val) "addr=3D0x%x, val=3D0x%x" +sm501_2d_engine_write(uint32_t addr, uint32_t val) "addr=3D0x%x, val=3D0x%= x" --=20 2.21.3