From nobody Tue May 7 12:58:09 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; arc=fail (Bad Signature); dmarc=pass(p=none dis=none) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652976104038397.58454703182815; Thu, 19 May 2022 09:01:44 -0700 (PDT) Received: from localhost ([::1]:57738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrias-0003H6-Oq for importer2@patchew.org; Thu, 19 May 2022 12:01:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nriFE-0007Xr-7j; Thu, 19 May 2022 11:39:25 -0400 Received: from mail-bn7nam10on2060d.outbound.protection.outlook.com ([2a01:111:f400:7e8a::60d]:1376 helo=NAM10-BN7-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nriF2-0008Rn-ND; Thu, 19 May 2022 11:39:15 -0400 Received: from BN9PR03CA0932.namprd03.prod.outlook.com (2603:10b6:408:108::7) by PH0PR02MB7669.namprd02.prod.outlook.com (2603:10b6:510:5d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Thu, 19 May 2022 15:39:02 +0000 Received: from BN1NAM02FT049.eop-nam02.prod.protection.outlook.com (2603:10b6:408:108:cafe::16) by BN9PR03CA0932.outlook.office365.com (2603:10b6:408:108::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.16 via Frontend Transport; Thu, 19 May 2022 15:39:01 +0000 Received: from xir-pvapexch02.xlnx.xilinx.com (149.199.80.198) by BN1NAM02FT049.mail.protection.outlook.com (10.13.2.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 15:39:01 +0000 Received: from xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 19 May 2022 16:39:00 +0100 Received: from smtp.xilinx.com (172.21.105.198) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Thu, 19 May 2022 16:39:00 +0100 Received: from [172.21.132.221] (port=36706 helo=xdcsswbld02.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nriEu-0007q5-5l; Thu, 19 May 2022 16:39:00 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nGpv5sEO0oB1o8YwK/Lc7tmixD/71bQd5Zdwt9HRSlgyxwQG0BcJkOHAXiyyW9QBWpz7qg3pT+PWsP3XxaLiHxg2Uh26fLbk0+ZQcOQE+yd+XjvuQH83pDHSdCqipdSEpCNMhMH4xj205ozN2AjaRciyzVrt92JaljTTfy16HPvgcnqpwYzYOcGH1M1ZYdF7ZRwuM/JCR/Tmjn/sSdPfOVz6ew1sJhkU2JkFtsXlFNi14sSYZYqu/p+CGBHge1LGHJnfGtsVKFSPxv1o0b81EQhzl2JyuNG74gm4QtxNN/W5+64uRfZjMqCpVDpNkambao/zAWuZQLgBhRHhaUFB8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9sPqp34Q0HGXX+sfFxve0sOE5/Q1M4AdqNx+1HvjzuM=; b=GTqRsVFQzXFKu+zWnrt0w1HQWqNJUcRLfA4BYWBbnfdXLTLYTVi3LgabpSosxnol3XKWKx1ASdeT4LTaB4jB1dZ2Pj09hUHAz0F14YViVBZSk8K6O3Iifs5idJbX1w2qG9fwEQB15pClPULMwsDPYY0ixw12X3GnsDGJIZKV6z5NzTriPk2/WolfBDBkAGyI4HSvjU0h+o71kALZH39c1QBK/ZENg6Bv0aKUcUTjlCm4cG/vatm+XwVusKlJ6xW0nTda878efOVtcQ0I7W5lzN+GOMbQBSjghwwpEw7odATHnIQs0SA4SWQKwSqiRXhw15Qiq10in+sB1fi5DQp7qA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 149.199.80.198) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=fail (p=quarantine sp=quarantine pct=100) action=quarantine header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9sPqp34Q0HGXX+sfFxve0sOE5/Q1M4AdqNx+1HvjzuM=; b=jfhIu1O3IUlLno1+OQnf27w7aTNIdUvdFpttdANbladObBPaoox+XZytshFBzSccvE1hsxwdF9hWxW4Y4q8ap53YuZrWdJNbz7iJDBtSUR9wny3MCd/xutVWsvhP8VNCSlR0yG5BmuCiqyQ+q/+8V4+nXhogYCtLZDCScuXd3Uk= X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 149.199.80.198) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=fail action=quarantine header.from=amd.com; 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning amd.com discourages use of 149.199.80.198 as permitted sender) To: CC: , , , , , , , "Edgar E . Iglesias" Subject: [PATCH v2 1/4] xlnx_dp: fix the wrong register size Date: Thu, 19 May 2022 16:38:26 +0100 Message-ID: <20220519153829.356889-2-fkonrad@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519153829.356889-1-fkonrad@amd.com> References: <20220519153829.356889-1-fkonrad@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 149ae7bb-6009-45d5-47c6-08da39adb29a X-MS-TrafficTypeDiagnostic: PH0PR02MB7669:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 2 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cWkjz81kFo8b9SrMkAlK0+upNr2f6KPhTjAX0fywGAoWu82Wxd0sAJWHXdfGLC4WQuMsMCAtKsssG9ZN1delEhvcRZg5CWIxREiSIMQuMJk6qBmCmZB+I7PMA80J7xISYPJCl+NsiDt41O1BBgbHr09G/PWycSYZ0Gc7ZEPgL8DlG7q7uaECIEnWi+Fr/ez9PqYgaLqwCf/mjiRz+ekLF715/dK6Tiz0hd9tO1Sqy6EEE3edA5rKWooq3t9ojij2+ruxvsJs+STyNchnYCfOCjAP+9s+K5ByuSpE49S/HhQ7r9a4HSNFxRVS9oLDlvHwbohSbUgaPX590P8ZUo76H7t11h8sDoy+kmA+L2JQbw3lt/P0Pg+4X5ezZqF85gyz7FdL6zSi+8xICF9CvA0baW58b0ghTbYnhqAM/SZDIKSzXMp8Y+mLOU70u16xaS7Ab5cGRvmKbPF9qN8W1PN54orI+R2tIEu7FLaXa4RvBhA31nFFHD38SfzgwgtZJf3EuiX3/XBsk6eOKNLOq+sEyjZg6UtCsQcXx5EFNEeS0A5ciXVPtLppamUCdAS9TaYGFPbGilkushw4XgGMobP1FGj0oB2Xixo+Qagr54g5hy3C3Q3dy5GbnPYqyzeKKtzsn8zhO8Zgc8yHxvjMOft0v3KkXeq04hpmIulQW6txWZdF7peVi/InAykUAXEMIPxOgI6HETyZZMNsELnDggGWEKrf8vY9WecFIe08IV2y62F/PE8bQ9YDLD3i1neG3TkiHwHD33SSm25qawugPr96etex9elimDHzVMIP1ubt1vU= X-Forefront-Antispam-Report: CIP:149.199.80.198; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:xir-pvapexch02.xlnx.xilinx.com; PTR:unknown-80-198.xilinx.com; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(7636003)(70586007)(70206006)(35950700001)(356005)(4326008)(8676002)(36756003)(54906003)(508600001)(86362001)(40460700003)(966005)(83380400001)(9786002)(47076005)(82310400005)(6666004)(6916009)(316002)(5660300002)(1076003)(26005)(336012)(2906002)(8936002)(2616005)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 15:39:01.3208 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 149ae7bb-6009-45d5-47c6-08da39adb29a X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.80.198]; Helo=[xir-pvapexch02.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: BN1NAM02FT049.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR02MB7669 Received-SPF: pass client-ip=2a01:111:f400:7e8a::60d; envelope-from=bounces+SRS=DmMzc=V3@xilinx.onmicrosoft.com; helo=NAM10-BN7-obe.outbound.protection.outlook.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Frederic Konrad From: Frederic Konrad via X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1652976105879100001 Content-Type: text/plain; charset="utf-8" The core and the vblend registers size are wrong, they should respectively = be 0x3B0 and 0x1E0 according to: https://www.xilinx.com/htmldocs/registers/ug1087/ug1087-zynq-ultrascale-r= egisters.html. Let's fix that and use macros when creating the mmio region. Fixes: 58ac482a66d ("introduce xlnx-dp") Signed-off-by: Frederic Konrad Reviewed-by: Edgar E. Iglesias --- hw/display/xlnx_dp.c | 17 ++++++++++------- include/hw/display/xlnx_dp.h | 9 +++++++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 9bb781e312..0378570459 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -1219,19 +1219,22 @@ static void xlnx_dp_init(Object *obj) SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); XlnxDPState *s =3D XLNX_DP(obj); =20 - memory_region_init(&s->container, obj, TYPE_XLNX_DP, 0xC050); + memory_region_init(&s->container, obj, TYPE_XLNX_DP, DP_CONTAINER_SIZE= ); =20 memory_region_init_io(&s->core_iomem, obj, &dp_ops, s, TYPE_XLNX_DP - ".core", 0x3AF); - memory_region_add_subregion(&s->container, 0x0000, &s->core_iomem); + ".core", sizeof(s->core_registers)); + memory_region_add_subregion(&s->container, DP_CORE_REG_OFFSET, + &s->core_iomem); =20 memory_region_init_io(&s->vblend_iomem, obj, &vblend_ops, s, TYPE_XLNX= _DP - ".v_blend", 0x1DF); - memory_region_add_subregion(&s->container, 0xA000, &s->vblend_iomem); + ".v_blend", sizeof(s->vblend_registers)); + memory_region_add_subregion(&s->container, DP_VBLEND_REG_OFFSET, + &s->vblend_iomem); =20 memory_region_init_io(&s->avbufm_iomem, obj, &avbufm_ops, s, TYPE_XLNX= _DP - ".av_buffer_manager", 0x238); - memory_region_add_subregion(&s->container, 0xB000, &s->avbufm_iomem); + ".av_buffer_manager", sizeof(s->avbufm_registers= )); + memory_region_add_subregion(&s->container, DP_AVBUF_REG_OFFSET, + &s->avbufm_iomem); =20 memory_region_init_io(&s->audio_iomem, obj, &audio_ops, s, TYPE_XLNX_DP ".audio", sizeof(s->audio_registers)); diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h index 8ab4733bb8..1ef5a89ee7 100644 --- a/include/hw/display/xlnx_dp.h +++ b/include/hw/display/xlnx_dp.h @@ -39,10 +39,15 @@ #define AUD_CHBUF_MAX_DEPTH (32 * KiB) #define MAX_QEMU_BUFFER_SIZE (4 * KiB) =20 -#define DP_CORE_REG_ARRAY_SIZE (0x3AF >> 2) +#define DP_CORE_REG_OFFSET (0x0000) +#define DP_CORE_REG_ARRAY_SIZE (0x3B0 >> 2) +#define DP_AVBUF_REG_OFFSET (0xB000) #define DP_AVBUF_REG_ARRAY_SIZE (0x238 >> 2) -#define DP_VBLEND_REG_ARRAY_SIZE (0x1DF >> 2) +#define DP_VBLEND_REG_OFFSET (0xA000) +#define DP_VBLEND_REG_ARRAY_SIZE (0x1E0 >> 2) +#define DP_AUDIO_REG_OFFSET (0xC000) #define DP_AUDIO_REG_ARRAY_SIZE (0x50 >> 2) +#define DP_CONTAINER_SIZE (0xC050) =20 struct PixmanPlane { pixman_format_code_t format; --=20 2.25.1 From nobody Tue May 7 12:58:09 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; arc=fail (Bad Signature); dmarc=pass(p=none dis=none) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652975847884976.9978056761364; Thu, 19 May 2022 08:57:27 -0700 (PDT) Received: from localhost ([::1]:51270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nriWk-0007Gh-OF for importer2@patchew.org; Thu, 19 May 2022 11:57:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nriFE-0007Xq-56; Thu, 19 May 2022 11:39:25 -0400 Received: from mail-co1nam11on20601.outbound.protection.outlook.com ([2a01:111:f400:7eab::601]:36577 helo=NAM11-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nriF8-0008Rr-3u; Thu, 19 May 2022 11:39:16 -0400 Received: from BN9PR03CA0945.namprd03.prod.outlook.com (2603:10b6:408:108::20) by SN6PR02MB4077.namprd02.prod.outlook.com (2603:10b6:805:38::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.18; Thu, 19 May 2022 15:39:02 +0000 Received: from BN1NAM02FT049.eop-nam02.prod.protection.outlook.com (2603:10b6:408:108:cafe::8f) by BN9PR03CA0945.outlook.office365.com (2603:10b6:408:108::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13 via Frontend Transport; Thu, 19 May 2022 15:39:02 +0000 Received: from xir-pvapexch02.xlnx.xilinx.com (149.199.80.198) by BN1NAM02FT049.mail.protection.outlook.com (10.13.2.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 15:39:02 +0000 Received: from xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 19 May 2022 16:39:01 +0100 Received: from smtp.xilinx.com (172.21.105.198) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Thu, 19 May 2022 16:39:01 +0100 Received: from [172.21.132.221] (port=36706 helo=xdcsswbld02.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nriEv-0007q5-K3; Thu, 19 May 2022 16:39:01 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FHazxJYKLcekMKLPk1aCJ936B0nwqvHXn0vaXEFOdNCgmyWBdXpbvaNFrHvk3qOF5fecqR70hv9wC78StwqgTlKavRBAhakNZVbFM3Tdm3gjTjH9qEF0izEbfXgiLiSDx/mJdCWSeThPCBlDlm/woMmwTu3mw2AvNGInJTO8yCaQ/OWWkZu0CgbUVF3+Xoue8ZTgDVVsp2pd6CYkXLPOrQaTPNpSh/81ymcWWI0M5Eq2KgeSPL/GcPFYKqZbHDvfrBZEz1dZijP4kP/WdgrarHeXOGwZnEulHhkzDlw8i9YBKpun/CtxCwJaQxRXn2Sg7qF/aPKQW8YuMtwJQs4CeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KWF4wWzAshbKIT65iDxAW9lCQFshEvs91UHeDOGDpmA=; b=UN0Aqn71IVt5Ei/002zVEPim2T5cWHLwLx5Af5BDjUXew5yQRtdyUx4WgIQ8Wt/xnXbgkObdSJkyz/SQVxnpZayv4WEIv39+ZfisbapJXdvpeCwksuHf48GzLQNzApo6sfirdI/j5vSFu5vLOz4p9ac1qHgym5A1N7TFVNYbnG87MWN83ywJuOExfF+K+MBK0Er2opW07OabtU36eLbQOxn6tYf38HlGA+jBbwtTvqPxcnHhUoE8ttslwYLUkH0sRpeu9/iceAbBfOn/8Q5T3ELgqdjitX662WfrDZ04mUi/1gq5QTCRrzPNvnpSkFUd5BJwy6ZCbGktQKD6Vi3GvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 149.199.80.198) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=fail (p=quarantine sp=quarantine pct=100) action=quarantine header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KWF4wWzAshbKIT65iDxAW9lCQFshEvs91UHeDOGDpmA=; b=sqyLrk+UDec9JRH05mUtb0Mvz5KZdExADJy1YBxLzg4szw7Jhq1U0qcK6ZV/lrnKCNBiDt+z5c2XCmCv7RQF+NlfoUqW/Q3kVYG6ZLc/eKwiPIB3hq2vUATvbUQ5ayaLVg9EoavwaS234KhyRx6uLFIqJvvy24QbFcpXB7HnoBY= X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 149.199.80.198) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=fail action=quarantine header.from=amd.com; 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning amd.com discourages use of 149.199.80.198 as permitted sender) To: CC: , , , , , , , Sai Pavan Boddu , "Edgar E . Iglesias" Subject: [PATCH v2 2/4] xlnx_dp: Introduce a vblank signal Date: Thu, 19 May 2022 16:38:27 +0100 Message-ID: <20220519153829.356889-3-fkonrad@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519153829.356889-1-fkonrad@amd.com> References: <20220519153829.356889-1-fkonrad@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a60f82a8-284f-4af8-b296-08da39adb34a X-MS-TrafficTypeDiagnostic: SN6PR02MB4077:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 2 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +H/B472+ngTQzbh7VXxO147kMUEyjiNerLhPM5SXGf+3bCyYAhMNqfD8r/HhKsTIsF8lHoNSpJkc93SihJ6a03USB+uY7drm844qdWw0lbbsjIYxOXCQqB4AIsFNxOIAYaHcx4GhzOATHMeGi51Q2QPTNktlgbBNdXyMjJ9oiN7Y4xt0Zi4KYHCDG8pmYohfiH+D7hlL3c+PsHDdWDzmUDQalR419KCMc1Y/dxGlr2nMJgDT8ceeEMPtekMZKWORFO/Tz2L4NZzMydf8keCtUdi7a+USh1C1vTycrlCUCxDFPKiXWzhyWVWZJd7dPNSCWmLx/CT1yVPciIfInHchu4NlWlztuCMePzO26UeYVRgMdtOP+kUcAfjBvLgEmRMyKuxt2eizPBokkewaMbeksHMlDFYNCFpuom2AVAKzcU8+U0OZGxImNZ0YKy6BIZh3EjNFpbcyZ689BPsbbi8pH9IaVj1AsjGBwa2horYvYnmmGmdFvVdHzotZbpJR7TJerw3XSdzUktfYZr43RY0ZiiJDqD0O4N/I2Yl81Imo6lUDVlmWbzSye8Sts6CWRwenU4I9ek8pcFuWQ6GnBBNXZ9A8hmoeNGsp8fPTzT2cLSucfzSoFfE7c4lk34y2n3A9CkP/VHb24DioUK88c6UxXJeflpySCcThTHrRpSX2lq/x1nLBD3VDjq7mcTqaUERPnLh0J7f9dHckflD20N8jGg== X-Forefront-Antispam-Report: CIP:149.199.80.198; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:xir-pvapexch02.xlnx.xilinx.com; PTR:unknown-80-198.xilinx.com; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(2616005)(107886003)(54906003)(36756003)(2906002)(40460700003)(1076003)(316002)(6916009)(5660300002)(336012)(82310400005)(47076005)(356005)(35950700001)(9786002)(8936002)(86362001)(6666004)(70206006)(83380400001)(8676002)(70586007)(4326008)(7636003)(26005)(508600001)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 15:39:02.4770 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a60f82a8-284f-4af8-b296-08da39adb34a X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.80.198]; Helo=[xir-pvapexch02.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: BN1NAM02FT049.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR02MB4077 Received-SPF: pass client-ip=2a01:111:f400:7eab::601; envelope-from=bounces+SRS=DmMzc=V3@xilinx.onmicrosoft.com; helo=NAM11-CO1-obe.outbound.protection.outlook.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Frederic Konrad From: Frederic Konrad via X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1652975849057100001 Content-Type: text/plain; charset="utf-8" From: Sai Pavan Boddu Add a periodic timer which raises vblank at a frequency of 30Hz. Signed-off-by: Sai Pavan Boddu Signed-off-by: Edgar E. Iglesias Changes by fkonrad: - Switched to transaction-based ptimer API. - Added the DP_INT_VBLNK_START macro. Signed-off-by: Frederic Konrad --- hw/display/xlnx_dp.c | 27 ++++++++++++++++++++++++--- include/hw/display/xlnx_dp.h | 3 +++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 0378570459..2686ca0f2e 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -114,6 +114,7 @@ #define DP_TX_N_AUD (0x032C >> 2) #define DP_TX_AUDIO_EXT_DATA(n) ((0x0330 + 4 * n) >> 2) #define DP_INT_STATUS (0x03A0 >> 2) +#define DP_INT_VBLNK_START (1 << 13) #define DP_INT_MASK (0x03A4 >> 2) #define DP_INT_EN (0x03A8 >> 2) #define DP_INT_DS (0x03AC >> 2) @@ -274,6 +275,10 @@ static const VMStateDescription vmstate_dp =3D { } }; =20 +#define DP_VBLANK_PTIMER_POLICY (PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD | \ + PTIMER_POLICY_CONTINUOUS_TRIGGER | \ + PTIMER_POLICY_NO_IMMEDIATE_TRIGGER) + static void xlnx_dp_update_irq(XlnxDPState *s); =20 static uint64_t xlnx_dp_audio_read(void *opaque, hwaddr offset, unsigned s= ize) @@ -773,6 +778,13 @@ static void xlnx_dp_write(void *opaque, hwaddr offset,= uint64_t value, break; case DP_TRANSMITTER_ENABLE: s->core_registers[offset] =3D value & 0x01; + ptimer_transaction_begin(s->vblank); + if (value & 0x1) { + ptimer_run(s->vblank, 0); + } else { + ptimer_stop(s->vblank); + } + ptimer_transaction_commit(s->vblank); break; case DP_FORCE_SCRAMBLER_RESET: /* @@ -1177,9 +1189,6 @@ static void xlnx_dp_update_display(void *opaque) return; } =20 - s->core_registers[DP_INT_STATUS] |=3D (1 << 13); - xlnx_dp_update_irq(s); - xlnx_dpdma_trigger_vsync_irq(s->dpdma); =20 /* @@ -1275,6 +1284,14 @@ static void xlnx_dp_finalize(Object *obj) fifo8_destroy(&s->rx_fifo); } =20 +static void vblank_hit(void *opaque) +{ + XlnxDPState *s =3D XLNX_DP(opaque); + + s->core_registers[DP_INT_STATUS] |=3D DP_INT_VBLNK_START; + xlnx_dp_update_irq(s); +} + static void xlnx_dp_realize(DeviceState *dev, Error **errp) { XlnxDPState *s =3D XLNX_DP(dev); @@ -1309,6 +1326,10 @@ static void xlnx_dp_realize(DeviceState *dev, Error = **errp) &as); AUD_set_volume_out(s->amixer_output_stream, 0, 255, 255); xlnx_dp_audio_activate(s); + s->vblank =3D ptimer_init(vblank_hit, s, DP_VBLANK_PTIMER_POLICY); + ptimer_transaction_begin(s->vblank); + ptimer_set_freq(s->vblank, 30); + ptimer_transaction_commit(s->vblank); } =20 static void xlnx_dp_reset(DeviceState *dev) diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h index 1ef5a89ee7..e86a87f235 100644 --- a/include/hw/display/xlnx_dp.h +++ b/include/hw/display/xlnx_dp.h @@ -35,6 +35,7 @@ #include "hw/dma/xlnx_dpdma.h" #include "audio/audio.h" #include "qom/object.h" +#include "hw/ptimer.h" =20 #define AUD_CHBUF_MAX_DEPTH (32 * KiB) #define MAX_QEMU_BUFFER_SIZE (4 * KiB) @@ -107,6 +108,8 @@ struct XlnxDPState { */ DPCDState *dpcd; I2CDDCState *edid; + + ptimer_state *vblank; }; =20 #define TYPE_XLNX_DP "xlnx.v-dp" --=20 2.25.1 From nobody Tue May 7 12:58:09 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; arc=fail (Bad Signature); dmarc=pass(p=none dis=none) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652975485812695.3612898551164; Thu, 19 May 2022 08:51:25 -0700 (PDT) Received: from localhost ([::1]:38918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nriQu-0006mE-Ps for importer2@patchew.org; Thu, 19 May 2022 11:51:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nriFI-0007Y2-Md; Thu, 19 May 2022 11:39:28 -0400 Received: from mail-dm6nam11on2061a.outbound.protection.outlook.com ([2a01:111:f400:7eaa::61a]:22752 helo=NAM11-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nriFD-0008Rv-Go; Thu, 19 May 2022 11:39:21 -0400 Received: from BN9P221CA0002.NAMP221.PROD.OUTLOOK.COM (2603:10b6:408:10a::9) by CH2PR02MB6311.namprd02.prod.outlook.com (2603:10b6:610:10::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13; Thu, 19 May 2022 15:39:05 +0000 Received: from BN1NAM02FT033.eop-nam02.prod.protection.outlook.com (2603:10b6:408:10a:cafe::fd) by BN9P221CA0002.outlook.office365.com (2603:10b6:408:10a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13 via Frontend Transport; Thu, 19 May 2022 15:39:05 +0000 Received: from xir-pvapexch02.xlnx.xilinx.com (149.199.80.198) by BN1NAM02FT033.mail.protection.outlook.com (10.13.3.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 15:39:04 +0000 Received: from xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 19 May 2022 16:39:03 +0100 Received: from smtp.xilinx.com (172.21.105.198) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Thu, 19 May 2022 16:39:03 +0100 Received: from [172.21.132.221] (port=36706 helo=xdcsswbld02.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nriEx-0007q5-3I; Thu, 19 May 2022 16:39:03 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c7rPsT3Gmmxn17pI9lu3BldoEq1PYSCtPsdncyyahmbFA0/3vQi4Pg1tc+PWL7pj6iZGr+WqjYl7V1MaqWZBqNbW65BoYbfJXdONr7F95ZIxFMzF3E08MN/NpGxFL0rwRbIPG7ewR98iexKmP7bAswiv6MloK4V6/F9dj63EJCIeeL06w5vsATBfkO68k+qid+1/uom1WfhEumulljxRdcnJaf71JGw+c25Z5eIQueWBYaX8Gpx7OZ4CWscl8bIPshkMT+lF81VE2VmONH6gnj3zzuRf1+gfKW1oD1cfg+XJIDuXNZFmj55jOylRwi7Qgv0wtxdZWpzVaWKK88H2Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Vd8GgUGKaBwpYrSq+WyjCHq/gMwAQatFy0bS2a2yuLY=; b=VRCMZqjc97Z3vgBlpeKviDAiJEVqIQaQ+gneuCcjnKsyvsV36hL9dQHpkrSWdijEzWKpNICnYKCaOqa9iIcgP96Kk4jzvmBe72rITfjfMo8JvpMYPVYGDYRMArEwLCwJguxH66hLP3hvou0RqxR2yHDkKTKAN4h1rDsPA/5QitE+kkOpo1Uv3HPkz9oX8IdXAjG50w2nsc9sUTUkls2ZOUjcFCSfYiZfYv2MTIAntDqGsXSxoKttX5QYt6w+fseD5uiW3EcsAl0KLT3gW8zl5wFQmt4ybkhrArtfX/y1MFaIQcWpGkVIlWuPoDSnUBRd5lGMkdzKgW/z/YIJhW2gsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 149.199.80.198) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=fail (p=quarantine sp=quarantine pct=100) action=quarantine header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vd8GgUGKaBwpYrSq+WyjCHq/gMwAQatFy0bS2a2yuLY=; b=CFea56eDaAsqGqRDTi0BR0q5WVt5ZlFmiTZfuILgDBvcu232kuPO1z1mzuPV29JZcnzopDHLdeKe3HzO9LDEyGQqzIv+lQwCtZjlX3xmkrtoP68HdNzAiYMo4uvZKGz1NipQLs0K1vELZzJYiAhxUy4AxJX22XO2TWyH9F9Ndcw= X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 149.199.80.198) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=fail action=quarantine header.from=amd.com; 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning amd.com discourages use of 149.199.80.198 as permitted sender) To: CC: , , , , , , , Sai Pavan Boddu , "Edgar E . Iglesias" Subject: [PATCH v2 3/4] xlnx_dp: Fix the interrupt disable logic Date: Thu, 19 May 2022 16:38:28 +0100 Message-ID: <20220519153829.356889-4-fkonrad@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519153829.356889-1-fkonrad@amd.com> References: <20220519153829.356889-1-fkonrad@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d2ec0f1b-665c-47bf-f496-08da39adb4c8 X-MS-TrafficTypeDiagnostic: CH2PR02MB6311:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 2 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QMtA0tnSgD1yyJ0B1A+dmf2G/M2GZXSAqDBPdXfZKGfRg2OR485NDFwgF7Ts+UPHeVRIBaNskzHYwy5eWlIIsVZWFkfCy4ZViB0mjYFeFwl1moEm/LJU48rXqYvEZPkyMq99czopiDdBbhxTzTkgp9hhAZLxwvD+mSOsqIU/+t3xOH/g5AyzbTR4U/bWc6CNbz92BYs+3CKdJvOA9Xvf3MK5XbM5IEndlSZExYM/Zwg1tQv64EhXyHcXhz2saOOpuVJsq/cfHnMURfm4Q/+L/xI3WDWMoG07PycJqxh7RCUr38rtYQ33bQ7nLwajp7mSk6kREQngek9xDKJTEp7fRoP68sf2rM9mfn4PAoLuun+A9kcuGqhj6ebdcPrW4gVzhTpStxrdgTccLtf858ofj/A/OVbNe8J7n7J20Q+Ubpzu1JfljB9dPVkjk+en+OxL/Z/yRKlV0AvTSNEp3WIoc2gwAquksTVjtcc9gQOq+eoX8yHjbD/joZxJb2LSHqYgg3NciwQeImQeLD1IxIyZ9pVRbe3RWh0PCWHxpBJ/A2L8gzZZ8y/Q1ZTvhndzur1gTi3kLg0HZnMfRHZVukG7DKSiXaDUTEQa8sgmkP51B3iTi40lRYTqiWjzLUcxmhYCydXKF+x8d+TQK7/v4t6hkGcHJKpz4131Y6U7EHyx+pbX/9GEL3ZmUPHvQ17PI1J+auWp/IS8MTiMHvX1i7gksA== X-Forefront-Antispam-Report: CIP:149.199.80.198; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:xir-pvapexch02.xlnx.xilinx.com; PTR:unknown-80-198.xilinx.com; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(107886003)(4744005)(35950700001)(2616005)(2906002)(82310400005)(5660300002)(508600001)(9786002)(8936002)(36756003)(356005)(83380400001)(6666004)(336012)(6916009)(316002)(47076005)(4326008)(86362001)(26005)(54906003)(70586007)(1076003)(7636003)(40460700003)(8676002)(70206006)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 15:39:04.9822 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d2ec0f1b-665c-47bf-f496-08da39adb4c8 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.80.198]; Helo=[xir-pvapexch02.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: BN1NAM02FT033.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6311 Received-SPF: pass client-ip=2a01:111:f400:7eaa::61a; envelope-from=bounces+SRS=DmMzc=V3@xilinx.onmicrosoft.com; helo=NAM11-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Frederic Konrad From: Frederic Konrad via X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1652975486802100001 Content-Type: text/plain; charset="utf-8" From: Sai Pavan Boddu Fix interrupt disable logic. Mask value 1 indicates that interrupts are disabled. Signed-off-by: Sai Pavan Boddu Reviewed-by: Edgar E. Iglesias Signed-off-by: Frederic Konrad --- hw/display/xlnx_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 2686ca0f2e..48c0a8a661 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -888,7 +888,7 @@ static void xlnx_dp_write(void *opaque, hwaddr offset, = uint64_t value, xlnx_dp_update_irq(s); break; case DP_INT_DS: - s->core_registers[DP_INT_MASK] |=3D ~value; + s->core_registers[DP_INT_MASK] |=3D value; xlnx_dp_update_irq(s); break; default: --=20 2.25.1 From nobody Tue May 7 12:58:09 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; arc=fail (Bad Signature); dmarc=pass(p=none dis=none) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652975319742473.88332715540014; Thu, 19 May 2022 08:48:39 -0700 (PDT) Received: from localhost ([::1]:33558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nriOE-00038T-Mj for importer2@patchew.org; Thu, 19 May 2022 11:48:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nriFE-0007Xs-5s; Thu, 19 May 2022 11:39:25 -0400 Received: from mail-bn1nam07on2060f.outbound.protection.outlook.com ([2a01:111:f400:7eb2::60f]:23553 helo=NAM02-BN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nriF8-0008Rx-9H; Thu, 19 May 2022 11:39:19 -0400 Received: from BN9P221CA0008.NAMP221.PROD.OUTLOOK.COM (2603:10b6:408:10a::30) by BL0PR02MB4642.namprd02.prod.outlook.com (2603:10b6:208:40::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.17; Thu, 19 May 2022 15:39:06 +0000 Received: from BN1NAM02FT033.eop-nam02.prod.protection.outlook.com (2603:10b6:408:10a:cafe::da) by BN9P221CA0008.outlook.office365.com (2603:10b6:408:10a::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 15:39:06 +0000 Received: from xir-pvapexch02.xlnx.xilinx.com (149.199.80.198) by BN1NAM02FT033.mail.protection.outlook.com (10.13.3.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 15:39:05 +0000 Received: from xir-pvapexch01.xlnx.xilinx.com (172.21.17.15) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 19 May 2022 16:39:04 +0100 Received: from smtp.xilinx.com (172.21.105.198) by xir-pvapexch01.xlnx.xilinx.com (172.21.17.15) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Thu, 19 May 2022 16:39:04 +0100 Received: from [172.21.132.221] (port=36706 helo=xdcsswbld02.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nriEy-0007q5-IT; Thu, 19 May 2022 16:39:04 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AmRtXE6USoFGeEslhh34G3OKTckXhijehJkBbNLnmemQ7Vq2jObo96XtA1crrd8Kc6un8WiWvOOTzHicJZdjiVaGtD7/2s8EBqmHqP0A8qVzcKh1EEVW5RgAUldhLbsw4z6UotZDuG+B4pxspoRezhh/1rMzq0T3VlYWai7Q5mtXD9Ne4RqyymqNZnrVcXx5g4DfmaNmSGkMDvaEsiu6EYlttOWdPV74q/UC6Qi4g+fg7pTG+3VxKAJ2xa9kqZsKE3xh9tb3bnVxsrauxZmbbrgwOG9nTOrI/20kff6la3uvdcp8RBxWdPdERlOgGNs2t2ya/2Sqt7ZhmwpQt9P6FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TJTUI8LE4GrkbevW5hQJgSYHGGQ54q8PX7vKxGohbCA=; b=mD4Fa2fGn70J8CjAWywe5hGFAp+9oMNRmhsuvr7vRgVaPP5V/u2Zg/KEi+aHBCCO9pFYZV8k8V/TYwth0F5h96iUjjj1spPCPzGdtrRz+8SYlrC+sQbSBGlgqwApTqo/kunwXd7g7lZoyS7PYA8zYQdLireQ56kEBdyrc/pPp/qtKGtJLbdJ5E5vCiy+Q+DIXMgKrHu+c8dpHhAsy04/DSdgTl2HzpK2gBg0OHVU3h+d6iTZV8xV5S6rhcLhioE/I7ebynFCrBoDuRwfDW2iimSkhwFZ4CDRTRjz8JpZLlD7y6MarqZIx1wdVSsv3td5On/Bl/K21mVJZsvoHIbkwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 149.199.80.198) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=fail (p=quarantine sp=quarantine pct=100) action=quarantine header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TJTUI8LE4GrkbevW5hQJgSYHGGQ54q8PX7vKxGohbCA=; b=dwdm6LRK8BxhrVTaRDRMCjesNG6UNE+sW4+WWcHy5RvyasRkFZJb3DatzfoI1NnfSvV/CPE+4yRpZIsrAd2j7Z4MdrXlo0cXGndF3hTLCbctumzHd2gPgz+/E1SwSSzmOtMcz3cmERAzD+y+y1FI4PwZUT0kD0lY32LJ/r7KA6A= X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 149.199.80.198) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=fail action=quarantine header.from=amd.com; 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning amd.com discourages use of 149.199.80.198 as permitted sender) To: CC: , , , , , , , "Edgar E . Iglesias" Subject: [PATCH v2 4/4] xlnx-zynqmp: fix the irq mapping for the display port and its dma Date: Thu, 19 May 2022 16:38:29 +0100 Message-ID: <20220519153829.356889-5-fkonrad@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519153829.356889-1-fkonrad@amd.com> References: <20220519153829.356889-1-fkonrad@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4007d633-775a-4248-d819-08da39adb550 X-MS-TrafficTypeDiagnostic: BL0PR02MB4642:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 2 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W9Db/oEM+KKNMoF9nZ5kOmQEBAKWn+bW4Ml5Sa9vdJzlj2t6N/9Y4HPseXOiftItggxR5SI1RrZctMEMLxYdF2f95t7HhLf+L8SigCX24EZKbXcCv1LQOVeFtbzIRqnISVrH/3EG+Yoy72nQmAvp6o83bQ8lVl70AU82jhHVXsLOWMkdits3ysUL49dJ2qnCYiSF66a7Zx4eDEi7PKclzpB3BKAXjwfiF4kDwRYomZnE+RNnL80LAgscKLCdW9uNN8wM5sKH8YG4PXmcfNz6+gt/13uHduMuAhSX0H7fWnrr711oPPGvoMpvNu5PTTqn5z4wEuodrkXD/WvpK9Hu5sAdNcH++iF6XmScUd+rJOZruHveO69FLbra++j39Bl9iF7CLnUK9BD+5zY7WV/MfUUxUitNPDi+Ljxf9LiQ3sDpo+CxB8fgpvbsto43SUJUMWaP4M0GA8j877XfxHxFQd8NnGFe4gxqvnkDGNaxKZjrQ1irFx70vIjnSvUIRfITZeLG3PVBG/Il8bhaboV05UOi/HHb+GpwE8XKXgFZLel6thqRWc9rud5I14yAQwjTQT1n59vGyeUyDzZegtdzCLmW9j2eA9MzdAi5MRk26N79Ll9OyS5dQW5EEuUNmvQQAiVCwyLZgyArXiTgcIN8p2axiSMc+Ah/Ipaz3i1+Hmg7HgL2bvOQzB9aSCzeOqY6V4fPvwh8SdvgWXu2Zsmbiw== X-Forefront-Antispam-Report: CIP:149.199.80.198; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:xir-pvapexch02.xlnx.xilinx.com; PTR:unknown-80-198.xilinx.com; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(336012)(54906003)(83380400001)(40460700003)(26005)(6916009)(70586007)(82310400005)(9786002)(47076005)(1076003)(8936002)(508600001)(356005)(86362001)(4744005)(7636003)(5660300002)(316002)(35950700001)(70206006)(2616005)(2906002)(36756003)(4326008)(8676002)(6666004)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 15:39:05.8727 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4007d633-775a-4248-d819-08da39adb550 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.80.198]; Helo=[xir-pvapexch02.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: BN1NAM02FT033.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR02MB4642 Received-SPF: pass client-ip=2a01:111:f400:7eb2::60f; envelope-from=bounces+SRS=DmMzc=V3@xilinx.onmicrosoft.com; helo=NAM02-BN1-obe.outbound.protection.outlook.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Frederic Konrad From: Frederic Konrad via X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1652975321860100001 Content-Type: text/plain; charset="utf-8" When the display port has been initially implemented the device driver wasn= 't using interrupts. Now that the display port driver waits for vblank interr= upt it has been noticed that the irq mapping is wrong. So use the value from t= he linux device tree and the ultrascale+ reference manual. Signed-off-by: Frederic Konrad Reviewed-by: Edgar E. Iglesias --- hw/arm/xlnx-zynqmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 375309e68e..383e177a00 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -60,10 +60,10 @@ #define SERDES_SIZE 0x20000 =20 #define DP_ADDR 0xfd4a0000 -#define DP_IRQ 113 +#define DP_IRQ 0x77 =20 #define DPDMA_ADDR 0xfd4c0000 -#define DPDMA_IRQ 116 +#define DPDMA_IRQ 0x7a =20 #define APU_ADDR 0xfd5c0000 #define APU_IRQ 153 --=20 2.25.1