From patchwork Tue May 3 15:25:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: frederic.konrad@xilinx.com X-Patchwork-Id: 12835934 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D891CC433F5 for ; Tue, 3 May 2022 15:39:40 +0000 (UTC) Received: from localhost ([::1]:40370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlucl-0004sC-NR for qemu-devel@archiver.kernel.org; Tue, 03 May 2022 11:39:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nluQp-0002yI-8W; Tue, 03 May 2022 11:27:19 -0400 Received: from mail-dm6nam12on20611.outbound.protection.outlook.com ([2a01:111:f400:fe59::611]:17889 helo=NAM12-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 1nluQn-0003nC-8u; Tue, 03 May 2022 11:27:18 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i/mVtE157CinzGHsDknsMchJu2xCPG6gOsCbr4UnSymCic/2yG6M5K+P8ScTRckI6mYRsJBPMUwaWmnk/26s6BmJoXBAJjI84LPv4UblKtr9pWaIqID8/QUw/N0U8inWNIkMAnv1XKP36og/HXRV/quZSRmzKjs764mvq+RBRZ8h7Gt0aUAfF4yyHkL+riaUkf2Jzc58KGq0BpYkcOMVvNhYO6+B+m3lw63R4+I+0TRCR/2T1BDujJkvUFCLNATuBCo/qFWXOJJiHhOoOW495RpDOiabUCEDvPyV6MwyCSBHVoHfKUJOGWQ5DP3uoWc5DbhQfrcQZYBNnGYav0yUBg== 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=RDPudHR2JUFyK2XZBx/iZMhpT0JvXFBP7hQ2JJaViuE=; b=PVFLDgefSc5xQtpJhI9IpHb6z/ePmzkVB+45Wt/xsr+wmi7X+oCKjieSI1owmPyjZyoWJv5d0xsmFeYS6bm9thMwBy5wfqZmHO81Wwk7LkHLmmX6ihDnIDX1OLHJwdaVVaovDPibGFtBNInke+RsJNRGnH2TFKuM7gAs+moUSlXZlZ/aEcvWnlr0u9FLB2SzutpQljjAXZcdjf8x94aEWfEzWxP7IuTMJbnAOkDSAHMLosh3zvXUgCwlFrUS58gtkiNySc3H/8YzMpTVWQ+TLnGp9LTqbkYufH2HK5z7+EBvvLTKQPT3vHRsD9xQ7A7+4rMwY49GbQJ88DUK+Hvd5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.80.198) smtp.rcpttodomain=nongnu.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.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=RDPudHR2JUFyK2XZBx/iZMhpT0JvXFBP7hQ2JJaViuE=; b=fOIw7mAxi40rATbAQLWSehqHtxDpGP0lO+u/k8YVOQPJM0ceGsNlV/Rv0O/l+FvgPZlyseV48U8YepmKeIGgkM8loZZVufrOKTfRApGmlSeMB9gvaIyPZxcHtyQUWKIQ9aWLIot2a+xvYI+06vheE/dcQgUn4tEdljZk6B3Swd8= Received: from DS7PR05CA0093.namprd05.prod.outlook.com (2603:10b6:8:56::17) by DM6PR02MB3947.namprd02.prod.outlook.com (2603:10b6:5:9d::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.17; Tue, 3 May 2022 15:27:13 +0000 Received: from DM3NAM02FT048.eop-nam02.prod.protection.outlook.com (2603:10b6:8:56:cafe::78) by DS7PR05CA0093.outlook.office365.com (2603:10b6:8:56::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.6 via Frontend Transport; Tue, 3 May 2022 15:27:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.80.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.80.198 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.80.198; helo=xir-pvapexch02.xlnx.xilinx.com; Received: from xir-pvapexch02.xlnx.xilinx.com (149.199.80.198) by DM3NAM02FT048.mail.protection.outlook.com (10.13.4.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Tue, 3 May 2022 15:27:12 +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; Tue, 3 May 2022 16:27:11 +0100 Received: from smtp.xilinx.com (172.21.105.197) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Tue, 3 May 2022 16:27:11 +0100 Received: from [172.21.132.221] (port=36824 helo=xdcsswbld02.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nluQg-0002mH-In; Tue, 03 May 2022 16:27:10 +0100 From: To: CC: , , , , , , Subject: [PATCH v1 1/4] xlnx_dp: fix the wrong register size Date: Tue, 3 May 2022 16:25:42 +0100 Message-ID: <20220503152545.1100386-2-fkonrad@xilinx.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220503152545.1100386-1-fkonrad@xilinx.com> References: <20220503152545.1100386-1-fkonrad@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27c22ee4-ce08-409e-27d0-08da2d1965aa X-MS-TrafficTypeDiagnostic: DM6PR02MB3947:EE_ X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CTFGe/vWMTFs2DBBfj2jZkcxpHioAYxbZa7HIcDoR/DaBFDbURP5gJAJ4w+HrFu/gO/qn2XGupDaGq/FUcBJW55duvQaT6ksOhFdyH892cBIDXxHq4vS43lKaE8eUaTSwtuNuv2M0TE/0/eopQfv1n6yaiQB0/AVeiasaQAumUjZVw/kptYk77o2wUVE/21crUz70VflSGYVmzfzSaDdh0OU0Y10WEE+ZJRDHIwu76oaq/PgNyd0hW1L4wTzovMtgOv9nCyRwt+T3jdzSCCrDPWj1C2Wl1/t0orRMMbgzElYnkrbQllDx/zSx1QUxtAGke98U238qnVNG6hydwzVI5rAFC+2xcKhLzfP7aoboydutX9+Gs3BrlPRDfqXpmHjJPsQBg5IEGKRKHHPlFAyYHlHCj+tQ/u2Kw3bICOlJZHXPOiY1C2XELXPgj3DB+OxzU2aAfm6j/vsO7p3+WvSkJ4huqGNlevtycojEGmIefUh2KzCDDl679XDVxODROkb2DW15s7zDzfkxv8plXHxFYdfFXNZUMPxNRZD6VHUSQUHoe07zVbGW1JA9jHFWlIVOnbat8aHX1R06nOUc1uP1b6YkdBgZUbGbsYHBXMfsiEjKQB6qxJFfq/k4uvCjPTphgUoag9p4S4u3pX/UhwKMZ7kncZJ248G+xp0YBZ2wFB7fqvBOxNBsaQqPu2hYu3Wpkm0RjJXqCXdO6BCuBaPqrnYVfWGQYLjEudyQmkUTpVFQalzOOFYgfJoHQw5Cthep4uTlMwwIARDCuobMSfLYtoC36i9mlbkIGUDLKix2V6NV+oim4lYRHt3XszuaSG25bR+iNNQbEWug53yn+zMvQ== 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)(36840700001)(2876002)(2906002)(4326008)(47076005)(8676002)(82310400005)(36756003)(70586007)(70206006)(9786002)(316002)(6916009)(356005)(6666004)(26005)(7636003)(40460700003)(8936002)(5660300002)(426003)(966005)(2616005)(508600001)(36860700001)(54906003)(83380400001)(336012)(186003)(1076003)(7696005)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 15:27:12.0992 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 27c22ee4-ce08-409e-27d0-08da2d1965aa 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: DM3NAM02FT048.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR02MB3947 Received-SPF: pass client-ip=2a01:111:f400:fe59::611; envelope-from=fkonrad@xilinx.com; helo=NAM12-DM6-obe.outbound.protection.outlook.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 03 May 2022 11:33:53 -0400 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Frederic Konrad 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-registers.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 = SYS_BUS_DEVICE(obj); XlnxDPState *s = XLNX_DP(obj); - memory_region_init(&s->container, obj, TYPE_XLNX_DP, 0xC050); + memory_region_init(&s->container, obj, TYPE_XLNX_DP, DP_CONTAINER_SIZE); 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); 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); 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); 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) -#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) struct PixmanPlane { pixman_format_code_t format; From patchwork Tue May 3 15:25:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: frederic.konrad@xilinx.com X-Patchwork-Id: 12835932 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 62F4FC433EF for ; Tue, 3 May 2022 15:36:39 +0000 (UTC) Received: from localhost ([::1]:60864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nluZq-0008AO-Hx for qemu-devel@archiver.kernel.org; Tue, 03 May 2022 11:36:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nluQu-00036L-Vw; Tue, 03 May 2022 11:27:25 -0400 Received: from mail-dm6nam12on20606.outbound.protection.outlook.com ([2a01:111:f400:fe59::606]:53216 helo=NAM12-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 1nluQs-0003p9-Um; Tue, 03 May 2022 11:27:24 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mrb6cVTin8OUczo3ktf9N9SEkM2GSOFMzxcyF1V/uzCzc3KUCTm0cXWdeWGoXHn66/XInqZ7XlJyhcZtCTHuzQicPitAtm1AK5Er3lLor2sk5/z90IYs1zFg9IjPLNqGgmsI9D512cF0ftfCeeEsgfu1V1yByPSSNolMDz1uyRjlW0O9jApt0D2tvfe6o+lgNIm/AMJlMLlFUxJozAHYyS4/ax87B1VqbHnQx5yPoN6Cyf+ypFOTnlYMllvMh1PgoPzVAg+9SqYkE4xdbXZ7pghEev0285X3QE+520LGE31Ft47jMl7ePCIIovcSB9GZv2tXuDxTM0/f2nMqKtvnvw== 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=JQjc8gCtHYX7GVeslX8wR6/K0nZXB8efsmstONP9ml0=; b=Z4DNNyvxspPgtTot2//fjv85oxVDpuYMjlaXvLqt2GgdXW3RFrjBA6FVZ3UCYiABtBC8igpNokz1E71zBR2K1uTWkECR7e/pQc9EHsFdkLZtgzfcYeqXP6x4BGVZ1b6QCq9ox0SHlAJTJqBvFAsB0KUoeEtmZQ0kXdtwpxm2eonBH6mOneSINUShKFCblYJGH+2GXjnipKQFCWEQqguxGBic/7/zBSQp00BFitWcf/chran015jKZsjdnGGFgSsHwdxQR3WqVBGhtguFjgtfuIDI/GAhtJtkJO0M0tQPmPtPg/vOeTkRlZeChufIrnAzkXZ3JdxH9iSGGS7mxDJc9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.80.198) smtp.rcpttodomain=nongnu.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.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=JQjc8gCtHYX7GVeslX8wR6/K0nZXB8efsmstONP9ml0=; b=XRRv+MF4AQHLIaLgIO8N/zcrzoqI9wBo9zrwV7+9pMIb/cKDvjWMontqij4HNW8c4Bw1l95vMJ+RGGajwBx1H9J37ubXxZW2R7IBR//FmHZWqAq9cIbM3sBmd+6ZYUsjLggwdBvPzy4W+cDRIg34lB0ivpk87lcZfid61tHXITE= Received: from DM6PR13CA0044.namprd13.prod.outlook.com (2603:10b6:5:134::21) by BY5PR02MB6179.namprd02.prod.outlook.com (2603:10b6:a03:1fa::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Tue, 3 May 2022 15:27:18 +0000 Received: from DM3NAM02FT039.eop-nam02.prod.protection.outlook.com (2603:10b6:5:134:cafe::19) by DM6PR13CA0044.outlook.office365.com (2603:10b6:5:134::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13 via Frontend Transport; Tue, 3 May 2022 15:27:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.80.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.80.198 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.80.198; helo=xir-pvapexch02.xlnx.xilinx.com; Received: from xir-pvapexch02.xlnx.xilinx.com (149.199.80.198) by DM3NAM02FT039.mail.protection.outlook.com (10.13.5.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Tue, 3 May 2022 15:27:17 +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; Tue, 3 May 2022 16:27:16 +0100 Received: from smtp.xilinx.com (172.21.105.197) by xir-pvapexch01.xlnx.xilinx.com (172.21.17.15) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Tue, 3 May 2022 16:27:16 +0100 Received: from [172.21.132.221] (port=36824 helo=xdcsswbld02.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nluQm-0002mH-4m; Tue, 03 May 2022 16:27:16 +0100 From: To: CC: , , , , , , , "Sai Pavan Boddu" , "Edgar E . Iglesias" Subject: [PATCH v1 2/4] xlnx_dp: Introduce a vblank signal Date: Tue, 3 May 2022 16:25:43 +0100 Message-ID: <20220503152545.1100386-3-fkonrad@xilinx.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220503152545.1100386-1-fkonrad@xilinx.com> References: <20220503152545.1100386-1-fkonrad@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 21888b33-0d30-48af-c4ac-08da2d19689c X-MS-TrafficTypeDiagnostic: BY5PR02MB6179:EE_ X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WtWZTQLPWMQjmt7iEPnsyaUcqoTnqyAvIVDxJ839XJKvNrpq3zEqXVVFmzG9M0iiGDY67hHGvob90JpJN6XzJCdDKfu+M1ixOVA48K8GyUXiZj3tLniy+mLwDOlAgC9/G3diT0ISUGIrHQK0sie+Ki9x+vILaGfMOflCDeJ32PvLvO2F8eUMVSExj/b2lvieFnBCGAEYimXbJi31A0ZCN+OwUr5LXRJ8iiF+28IM86EsObXMjz2D5ktytZD3VLxVNf0bcV34OaPx20f5021Jow2WQQZR86gchd94GZRQ8t7/Ysf9G9vAuhZ+anhCa4a0+h2tAxDViys33sX75/ZP1c4J7FgQ2YW7JYe+H7hW7oIxMOzd81C8iQKcgI/ZkQCJg86+kBFNIhdVD/jBdLotF73tsZ2wKWe6bDtr3nTWjdH2LyvqxnxYOiDetuZU33RZya121dfcwAe1UL5qY7M3OluDl+FQ2eDQsAlvLWyBR60+tAEbKxIqPSYaHXnZqmgzGOYXJcwxvS2XhlAKXK/EC/RmjUNzf2QjGzx4vxVGo3TLk+cXr3NRpY8949pA/CWuBOY3ZOIPo9yW1NcgAe5IQqZc8GKhjvhwKgz9wdtpUDPy771t05dJezR1GlkkXoPiEqj2iTReStR9a5c0Ts/v1kzNMK9m6vwhs5eE252T+7KODBCok25i/NiQLmY+JBSEVnJeTeUCsvII9+ckmmP1nQ== 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)(36840700001)(46966006)(40470700004)(54906003)(6916009)(2616005)(5660300002)(4326008)(336012)(36756003)(1076003)(426003)(316002)(186003)(70586007)(70206006)(7636003)(356005)(107886003)(9786002)(8676002)(47076005)(2876002)(82310400005)(508600001)(2906002)(36860700001)(8936002)(26005)(7696005)(40460700003)(83380400001)(6666004)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 15:27:17.6070 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 21888b33-0d30-48af-c4ac-08da2d19689c 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: DM3NAM02FT039.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR02MB6179 Received-SPF: pass client-ip=2a01:111:f400:fe59::606; envelope-from=fkonrad@xilinx.com; helo=NAM12-DM6-obe.outbound.protection.outlook.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 03 May 2022 11:33:53 -0400 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Edgar E. Iglesias --- hw/display/xlnx_dp.c | 24 +++++++++++++++++++++--- include/hw/display/xlnx_dp.h | 3 +++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 0378570459..984b0a6bb9 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) @@ -773,6 +774,14 @@ static void xlnx_dp_write(void *opaque, hwaddr offset, uint64_t value, break; case DP_TRANSMITTER_ENABLE: s->core_registers[offset] = value & 0x01; + ptimer_transaction_begin(s->vblank); + if (value & 0x1) { + ptimer_set_limit(s->vblank, 1, 1); + ptimer_run(s->vblank, 0); + } else { + ptimer_stop(s->vblank); + } + ptimer_transaction_commit(s->vblank); break; case DP_FORCE_SCRAMBLER_RESET: /* @@ -1177,9 +1186,6 @@ static void xlnx_dp_update_display(void *opaque) return; } - s->core_registers[DP_INT_STATUS] |= (1 << 13); - xlnx_dp_update_irq(s); - xlnx_dpdma_trigger_vsync_irq(s->dpdma); /* @@ -1275,6 +1281,14 @@ static void xlnx_dp_finalize(Object *obj) fifo8_destroy(&s->rx_fifo); } +static void vblank_hit(void *opaque) +{ + XlnxDPState *s = XLNX_DP(opaque); + + s->core_registers[DP_INT_STATUS] |= DP_INT_VBLNK_START; + xlnx_dp_update_irq(s); +} + static void xlnx_dp_realize(DeviceState *dev, Error **errp) { XlnxDPState *s = XLNX_DP(dev); @@ -1309,6 +1323,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 = ptimer_init(vblank_hit, s, PTIMER_POLICY_DEFAULT); + ptimer_transaction_begin(s->vblank); + ptimer_set_freq(s->vblank, 30); + ptimer_transaction_commit(s->vblank); } 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" #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; }; #define TYPE_XLNX_DP "xlnx.v-dp" From patchwork Tue May 3 15:25:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: frederic.konrad@xilinx.com X-Patchwork-Id: 12835933 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CC5AEC433EF for ; Tue, 3 May 2022 15:37:59 +0000 (UTC) Received: from localhost ([::1]:34948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlub8-0001M6-Ux for qemu-devel@archiver.kernel.org; Tue, 03 May 2022 11:37:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nluQv-00037X-6o; Tue, 03 May 2022 11:27:25 -0400 Received: from mail-dm6nam10on20600.outbound.protection.outlook.com ([2a01:111:f400:7e88::600]:3936 helo=NAM10-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 1nluQt-0003pJ-MY; Tue, 03 May 2022 11:27:24 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TK7Wm+5XStFuLumE0SQryRWCq1YEBrmdaqHrddgxYmgc8OcjpAVBukh6kJ4jZ7vZnh8Qauj5R5DpI982sYWQhsHolPKbppzIEidR2oKt2u3Ee1/TgvsSpm3MlijMYRQbDtctotVmN0D8mBCdq8irzT5IOX9gLFocuA/tjoVTDNbH0jnGkg/9LKtY/PdLqdi7X0MSjjHPxQPbBTbvC7e9VYyFqzMAbqCGWsGfj9ei6LbShmVtMogwUwgBNjXJ3Wiyw4ggTNaI5KEp9OaFrV8UiImPVZz7cLsG4McBBc/S6F54J2TMPfGN2Kzcn++Z1rVHRSpK6XDdfM0eWJ0A6NDuwg== 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=0R8ow6bi2HAhkFA4khx9ntTUNBzaR3vRmhzCKhXKPRg=; b=eSYYeCj+WBkHMkaPSnc1jw3mcO51Wl70qLPQ8vJ80LLn2rOMcp+9lH96xkHM/mDW9Niwl8yAPBAK6u0/uDwjv3srPzHUvTUklXkPjIIDxGXy0CnqnVjGLY5DwGb9DPXDlEZz63U2FXXrTy96vphC76GNpckXbl8pgwrwyf32ShTZvPD1JGdkIwdfjIo2b7fJgZT/FPYmxnu/YKxAhihq7R3RamKKUXY2mAKZSvLpDUX5wp+5cpR0l3/mhAY9y9WotkOEQOVUQIWnKKJ/za7WgAxgL0NWuz1cYBGCZ2MYfKBXOUPHspTldIz5YhDLq0W9hp8dIODZmLhAVJoFezi+xA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.80.198) smtp.rcpttodomain=nongnu.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.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=0R8ow6bi2HAhkFA4khx9ntTUNBzaR3vRmhzCKhXKPRg=; b=gwhxKOzxAUJl6Aeg2tz60C/N34507GKSXGEZjXAkoJID7+IiLc4jgQ7jPTu0rv3HL328Uh9LjI0qxtsC1lnkzqEawziwSruABZjBQUuqRRG+gpzzK+bATAt+62hRHYflPSd7o6Kvl39FlBrX8pHUmX81+XJbIKP4kpmHQHv7JZY= Received: from DS7PR05CA0039.namprd05.prod.outlook.com (2603:10b6:8:2f::16) by DM6PR02MB4953.namprd02.prod.outlook.com (2603:10b6:5:1a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Tue, 3 May 2022 15:27:20 +0000 Received: from DM3NAM02FT053.eop-nam02.prod.protection.outlook.com (2603:10b6:8:2f:cafe::89) by DS7PR05CA0039.outlook.office365.com (2603:10b6:8:2f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.6 via Frontend Transport; Tue, 3 May 2022 15:27:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.80.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.80.198 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.80.198; helo=xir-pvapexch02.xlnx.xilinx.com; Received: from xir-pvapexch02.xlnx.xilinx.com (149.199.80.198) by DM3NAM02FT053.mail.protection.outlook.com (10.13.5.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Tue, 3 May 2022 15:27:19 +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; Tue, 3 May 2022 16:27:18 +0100 Received: from smtp.xilinx.com (172.21.105.197) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Tue, 3 May 2022 16:27:18 +0100 Received: from [172.21.132.221] (port=36824 helo=xdcsswbld02.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nluQn-0002mH-Us; Tue, 03 May 2022 16:27:18 +0100 From: To: CC: , , , , , , , "Sai Pavan Boddu" , "Edgar E . Iglesias" Subject: [PATCH v1 3/4] xlnx_dp: Fix the interrupt disable logic Date: Tue, 3 May 2022 16:25:44 +0100 Message-ID: <20220503152545.1100386-4-fkonrad@xilinx.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220503152545.1100386-1-fkonrad@xilinx.com> References: <20220503152545.1100386-1-fkonrad@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2c13bcb2-5204-4d1f-f59f-08da2d1969f1 X-MS-TrafficTypeDiagnostic: DM6PR02MB4953:EE_ X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8wdNBJi6Lf8tCWW5N/nOKQuWfVaTNptkgS6Rash//pDZtuQQZoFK2B4fAseoEsXheoxrElj4tn0NhAxflshpi4mZ2EF0nGeg3k9jEDOJnFaZItgVFKB52cQ8QMvBXW8HyM0YTnxmGbrRTskY/Z4uc+xIjkbX7vmkxj3G4pTqmiF3AicoKw1CDHGZCEES7HZhS8ET70ybtgtFn72yfDAJhmqnbjf1me25VQZ4MqkUQmhf+9L+CWzQwPZn8sZ6ZcLzykv4d7Lx7eC+UVrqMc1vjN776ck0a3oNDQ2Oh6cz1gIP7WzU9ZxGq8SJRSwDACsfymnLuBHwO0xWfQ42rHKymX4nlhjmG1x+tQeqGAf8V6fum/hxW83g6p9MqAPMzbTdhTVELxZGJ43BF1BK1PV3qJG/GU9fQgt9jeJuckoffAuhEbEazBkJjkPFi+hL6LiDgWm0664vWkXwmAV80dVLgj6wwg0qsCv0ZqB0UqDnZbW0366IDl8woDnP61fD7XeUEQNFWyQ9fhsw9HuRzklFFS7ppTQmzSQojFDCXfwf1cLl+0cgB8Wx8aghMBt5lOhGLHchbjoM8MqKoRKpaqUwGuxXRmTA4YJ4gTqlF/nQQPu4gCTpyvRVor1nOAV9F5UTg9pc2JIuWGtgVIv7Z6UGsgg7b5Lru4qb4o6i/tn+DkCsIBLDSn9wzpXzRH8iF47TnSaCrgSN7xp2Yy1IqFrcuQ== 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)(46966006)(36840700001)(40470700004)(356005)(8676002)(8936002)(4326008)(9786002)(36860700001)(508600001)(7636003)(40460700003)(5660300002)(107886003)(70586007)(1076003)(70206006)(2616005)(2876002)(82310400005)(316002)(426003)(336012)(6666004)(54906003)(6916009)(36756003)(83380400001)(2906002)(186003)(7696005)(26005)(4744005)(47076005)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 15:27:19.8431 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c13bcb2-5204-4d1f-f59f-08da2d1969f1 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: DM3NAM02FT053.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR02MB4953 Received-SPF: pass client-ip=2a01:111:f400:7e88::600; envelope-from=fkonrad@xilinx.com; helo=NAM10-DM6-obe.outbound.protection.outlook.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 03 May 2022 11:33:53 -0400 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 984b0a6bb9..c60e8d0386 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -885,7 +885,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] |= ~value; + s->core_registers[DP_INT_MASK] |= value; xlnx_dp_update_irq(s); break; default: From patchwork Tue May 3 15:25:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: frederic.konrad@xilinx.com X-Patchwork-Id: 12835930 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B3A8DC4332F for ; Tue, 3 May 2022 15:36:15 +0000 (UTC) Received: from localhost ([::1]:60128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nluZS-0007bH-J8 for qemu-devel@archiver.kernel.org; Tue, 03 May 2022 11:36:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nluQx-0003BG-L9; Tue, 03 May 2022 11:27:27 -0400 Received: from mail-bn1nam07on2061c.outbound.protection.outlook.com ([2a01:111:f400:7eb2::61c]:26849 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 1nluQv-0003pk-OC; Tue, 03 May 2022 11:27:27 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UGw+35gjlq4KgJWkKDEBywhGZADfzIkCFT3sSjTC1OlsAWlQlRoMV6OMP+7mrWI5rnLlu8n2Kad3Xx9VbCGMfWBPuD1WpmY5lkoPYWpocRAF5ijM5wlXAvCnqH8Ig1imBUNZ7/kzG8lXuCNRiR+d23bbHTj1d+GB6tmFdcS4m8nwv4bQSYJhYAAcyf2ta1Ye/a2HnDOPL6DOtHW+3mG53Y88+ZSLm+kCX+4igcMYGNHouDc+4lGnJUeXPPLnNEDVffTuOSzYDIbGD9KOb7doMFzunh0klEQ/5wTbbZ0QFSxWGD6gDcNg3qfdT97o8VtmcSGGT5DA8gHmLTj9dJLoFw== 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=QCO+F32+RoXokm4SjurhwZBcZIjO6ughu678DMF5GeE=; b=bN8m7edSlUY9qRN11LjO2jtSQT54DGQZ3eZbjrF8TvxDJRqtW2zjDldW99DbirQOnpMwL2pFdT1XLGos6K1Tab4QPC2X0qluR1RWhSa2cWikiIhMKAdch0jX/zwWo+fIBd6wMuQcoYC1HdELQ1/BX7Ln9eu+HDNCDChS42bmmGiuou5xdQSy5k8vrV5zNv8ldSGoAjJVz0qzNpNCDwIqFAecKyJwMCxtzPJYu2QFalBhfit6vIniYFzdqztI6M0ggmhqdSInn9na1kTTzVgtdTGphKrinMVpT6IxYK4B0TXyCoDKwHAFip0Plmn9HUy5kwaYkXzbHj+Qm83wgmfYLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.80.198) smtp.rcpttodomain=nongnu.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.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=QCO+F32+RoXokm4SjurhwZBcZIjO6ughu678DMF5GeE=; b=X0IN7li86mNvB30CLer+LOG3LQOaRPL6xfU+5yxLDb8FwAY1pZGaFTQ67HT5rz5x5pDQx3xTQeTsEyt5z19k7DRb3JFec3xxrau98O9OJI93CXEknMKCXMiXpHRGdvVUCcXLN6pDff/AJKCy89y8xY/WKxNvmfUT4h7Y+vKE5T0= Received: from DS7PR05CA0039.namprd05.prod.outlook.com (2603:10b6:8:2f::16) by BYAPR02MB4549.namprd02.prod.outlook.com (2603:10b6:a03:15::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.20; Tue, 3 May 2022 15:27:21 +0000 Received: from DM3NAM02FT053.eop-nam02.prod.protection.outlook.com (2603:10b6:8:2f:cafe::89) by DS7PR05CA0039.outlook.office365.com (2603:10b6:8:2f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.6 via Frontend Transport; Tue, 3 May 2022 15:27:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.80.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.80.198 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.80.198; helo=xir-pvapexch02.xlnx.xilinx.com; Received: from xir-pvapexch02.xlnx.xilinx.com (149.199.80.198) by DM3NAM02FT053.mail.protection.outlook.com (10.13.5.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Tue, 3 May 2022 15:27:20 +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; Tue, 3 May 2022 16:27:20 +0100 Received: from smtp.xilinx.com (172.21.105.197) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Tue, 3 May 2022 16:27:20 +0100 Received: from [172.21.132.221] (port=36824 helo=xdcsswbld02.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nluQp-0002mH-Dn; Tue, 03 May 2022 16:27:19 +0100 From: To: CC: , , , , , , Subject: [PATCH v1 4/4] xlnx-zynqmp: fix the irq mapping for the display port and its dma Date: Tue, 3 May 2022 16:25:45 +0100 Message-ID: <20220503152545.1100386-5-fkonrad@xilinx.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220503152545.1100386-1-fkonrad@xilinx.com> References: <20220503152545.1100386-1-fkonrad@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7092aabe-96c8-446f-75fc-08da2d196a96 X-MS-TrafficTypeDiagnostic: BYAPR02MB4549:EE_ X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0Pkfkbf+xMn7Vk2Jb4gcUivLJzP8frnjsfZpnp0+3nc2I4uPE8NYz3gjQ8/r+UtT67XtWGoBkt/EFVukWpc2MWopWfEzCV9w85TxqlMpeTmVRcqdN2sdR75s7X7Xq+pJxiTad7cF957N5Pgm67ioVx/Wb4mH5sErmDyQ5wB7CrfDpA/F6YtNG2e6DCD5VqtyEknaDGJkWOYai19gcLeJW05ORBRK0VPUtIIyQvNEzDMqOHbxf3neYmgAWaYj2mFCS3RjR18Nne2C8Q09dFBhgudCDT2HpX3OKYsYVnFuV/aUnhnKcCyzIyJu9JhX30lRwx+9AnefE3F9eXkJAshigr7zgGkfoBb1/yfrhmwF7+46YkptTMPBoSiMv+/tkD50Y4IOEP2LGjnt2tlOgktiykAHQJqQHIcZ97w01VXunmcdYWzsRuqBFlk8nRhjJUJhIkZ+aQVDRPq7Kb0QTzg4oJW2ZpHI292uq9GjymIGIDrS+bWsIP9wiWMoCZ4/Dc1RkaKuRG5kIEbNA2+eI97OMoMZuE36HvU4GZBxZfR+lT/GSOFg33Qhyhv7hut3bCox/cMjwS8Im2SP+Y3YKKa2U9z3HpjFb6Bh6SXpqtBc3jeY6Nthto5Q2oxICBuQuN3NKP6kgmLoxtaBNb0G2UD3FiZvbUrfQqfDTdxSRn4Y4ui9OLg7R8X2N2odIXCsfJQ4Pa17YZLEVbMK7lWWbWJGNA== 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)(36840700001)(54906003)(2876002)(4744005)(2906002)(508600001)(26005)(6916009)(5660300002)(70586007)(8936002)(70206006)(426003)(36756003)(9786002)(1076003)(2616005)(8676002)(4326008)(36860700001)(7636003)(336012)(356005)(83380400001)(82310400005)(40460700003)(47076005)(6666004)(186003)(316002)(7696005)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 15:27:20.9055 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7092aabe-96c8-446f-75fc-08da2d196a96 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: DM3NAM02FT053.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR02MB4549 Received-SPF: pass client-ip=2a01:111:f400:7eb2::61c; envelope-from=fkonrad@xilinx.com; helo=NAM02-BN1-obe.outbound.protection.outlook.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 03 May 2022 11:33:53 -0400 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Frederic Konrad When the display port has been initially implemented the device driver wasn't using interrupts. Now that the display port driver waits for vblank interrupt it has been noticed that the irq mapping is wrong. So use the value from the 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 #define DP_ADDR 0xfd4a0000 -#define DP_IRQ 113 +#define DP_IRQ 0x77 #define DPDMA_ADDR 0xfd4c0000 -#define DPDMA_IRQ 116 +#define DPDMA_IRQ 0x7a #define APU_ADDR 0xfd5c0000 #define APU_IRQ 153