From nobody Sat May 11 12:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=xilinx.com); dmarc=fail(p=none dis=none) header.from=xilinx.com ARC-Seal: i=2; a=rsa-sha256; t=1654104477; cv=pass; d=zohomail.com; s=zohoarc; b=QindLWVKUr78SZdeOvooOCy9y5LX713wIp4IjoInLtFGmBMZcuctngVBYtvex9qc0vDZOBnY3dMGXwxX5Q624rVVHJ/ClLNmk5D915VbDFwp0sc51MYXS7Hb7KnMDsR+VTdwQwMn9eU7f+vcuWc/35dJbXXDm9LBqbgFi3ulE0g= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654104477; 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=FDM279kShe6n0Q5FrJfClGQQCNd8sC/v5OLwb93I1Wo=; b=kDznq3aoo58eYhalYDif2zna0aDwg0mRlYnNIV1d4spBf7VuqxBdO1jIN0Ezgb3y495XV0stFhkCX1+4BH/6RKWU3Wq0NwObqREyagsafG+GyNs373EsK9eNVJ/Hu2QX17ZYRysPbpmMu9krSOnwwHvq0NVdicHRNm63Q00yi5w= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=xilinx.com); dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654104477862181.71361642206875; Wed, 1 Jun 2022 10:27:57 -0700 (PDT) Received: from localhost ([::1]:45766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwS8S-0006bF-OT for importer@patchew.org; Wed, 01 Jun 2022 13:27:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwS4r-0000fY-2R; Wed, 01 Jun 2022 13:24:13 -0400 Received: from mail-co1nam11on20605.outbound.protection.outlook.com ([2a01:111:f400:7eab::605]:43395 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 1nwS4o-00072q-VJ; Wed, 01 Jun 2022 13:24:12 -0400 Received: from SA0PR11CA0196.namprd11.prod.outlook.com (2603:10b6:806:1bc::21) by SJ0PR02MB7534.namprd02.prod.outlook.com (2603:10b6:a03:320::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13; Wed, 1 Jun 2022 17:24:06 +0000 Received: from SN1NAM02FT0041.eop-nam02.prod.protection.outlook.com (2603:10b6:806:1bc:cafe::4f) by SA0PR11CA0196.outlook.office365.com (2603:10b6:806:1bc::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13 via Frontend Transport; Wed, 1 Jun 2022 17:24:06 +0000 Received: from xir-pvapexch01.xlnx.xilinx.com (149.199.80.198) by SN1NAM02FT0041.mail.protection.outlook.com (10.97.5.44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5314.12 via Frontend Transport; Wed, 1 Jun 2022 17:24:06 +0000 Received: from xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) by xir-pvapexch01.xlnx.xilinx.com (172.21.17.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Wed, 1 Jun 2022 18:24:04 +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; Wed, 1 Jun 2022 18:24:04 +0100 Received: from [172.21.132.221] (port=53720 helo=xdcsswbld02.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nwS4i-0004Ck-I9; Wed, 01 Jun 2022 18:24:04 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WmI5H2PNDghYeFEZyhLfPiok6ERIHOkRtYnhXwwUYYJbvDlOAuxWtATUFjKastkXvhCMwgx77k8f13wBUddws+m5KXUqllbLWcybN7wDIaVhOAn2g8gRMkFPfd60xFUa3XTWZW7VsNiWrwJdL+PwQzugP3nqK/8pPLJVAosmtcYdVjm2xVJ58T086RYC3tXhlnOQK34aN0o5LS4wchuUR6SAirK28pkNSkSy9GYQsFcoD7+8XC6Q5nYWzygIMGnohx0WUa/7lAXblpXFd4ZoGhTRwSzEhfiHLLVpGQJPyW8MJmybMVoszrs47NK4ioYOpOfIRc3zFxuRTzykinCzSw== 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=FDM279kShe6n0Q5FrJfClGQQCNd8sC/v5OLwb93I1Wo=; b=WJ9wN/VK9ZP3tFbvbtep+dwz1K+m2PMsLGPWbUiReC+hdN0ItDvqB7rV0jWE2s2toftcfB+srtLELlYi9HEJC7pL+vwNqhzxogV/hLPJsGvrVDmFKUMjSRa43uXH0lRAHdicq+QAfwhcBF7rNaiLqV9aocjSu4KSSNq6jJB7P+M2/z8Ht0JuUJviI9lL0NVcoaPaZpQDPpnQA+ZN3hhRk91dtX2ldM34gfEu+nspTMMcbHQYQ7V52Tm9j6DDAecGCSMudalw0nGX3E42lpdgiiv3KM/ihHJlK4yO7wC1JQU3WKEJNYf7MKWAiwMb6vhjBjtTVz19rpM0cYLJogc1qQ== 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=FDM279kShe6n0Q5FrJfClGQQCNd8sC/v5OLwb93I1Wo=; b=Kb5QcP+EmTp+JXiYHJEgwIVpdj5BgzK+esTA1o7HQasIdecmIv2it618gw2xzFoFe+w6eI5MBbxIh56oj23SfkuQ74NjROPqrE5ge+vpEl1RTrLIFDVUFeGs8AGdA0+cKQPpk62Rd4V/x/vhiCKrAWURLSYJAIQR2JP1sEWqIwk= 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 (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 (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-pvapexch01.xlnx.xilinx.com; pr=C From: To: CC: , , , , , , , "Edgar E . Iglesias" Subject: [PATCH v3 1/4] xlnx_dp: fix the wrong register size Date: Wed, 1 Jun 2022 18:23:50 +0100 Message-ID: <20220601172353.3220232-2-fkonrad@xilinx.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220601172353.3220232-1-fkonrad@xilinx.com> References: <20220601172353.3220232-1-fkonrad@xilinx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 671844a2-174c-4a49-de00-08da43f387f5 X-MS-TrafficTypeDiagnostic: SJ0PR02MB7534: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: tk7XkmJdPsRqGOfGglaBhO/nAfPM+FLwk11WonqlBUKYF9jIKkCCqgnih8Z+21QuR+rb65SL4bybkssCWecWx0yBbq9/2rIgMr6Tq5lxAzaP+obfAqN0L8zJd87H5upYpFu2JcJDohLiOHSn8MkVhpBXLNGjlcgcEwX0W97qPWcz6QNVXE9X9pwRkV+wJOQUreqYgjUVVnH4dADBlwBqXh434MkRlR52vP6JoG9Au3BbJomuwZzqmBULpXcifBnd98DnqUMZbWF/sekkEkPkW7LjdzVaF25Ve93U+MBwrqSivcgB7jnRpfUuALV+wcTSErLFZ3CR7IytGa4LfR7zcOogmu1erb6oEyu+Tg+NYqBFU1SPdW+k8lXhSOCmsFUfQWG3+5TLIOBf+KS22N/46ZaDn/IwWkS+m2+AO/QGK8uivApu++FMvmH7PfhY+eJOqC/BDjkQSmK5bTN30fkfFaakjEh5GP1wSlPkwVvP26iPrhML3seAqOQvrpxsbX/N1bqeCLQPtQKsQtCx983wR1HKmH3GJMDfmth3y3VFRWxTFNzBINZTX1NNETsqjXQThMo9zBlR5IF5nzErjW+L2qQsNEVhEmhwB112AQ84t++y1HaWbUGMqSN8yecDp2HBZVFj0fvz48PKGgNboCmD1Q0/YX+FqS2wramKNCAdJsL49m3ekXd3QZcHx9zr4pwZIY8IbUBajiiRYqIoJHxvEYyVGzOMycjjImq4RUXhE6cvk9fmReR1r0jyIJZmPwwvd8MZLgNJObgn+ohZOjRAORCROZDWOffV906jHKTIlcQ= X-Forefront-Antispam-Report: CIP:149.199.80.198; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:xir-pvapexch01.xlnx.xilinx.com; PTR:unknown-80-198.xilinx.com; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(356005)(966005)(26005)(36860700001)(316002)(7636003)(6666004)(8676002)(4326008)(2876002)(7696005)(54906003)(6916009)(1076003)(83380400001)(426003)(47076005)(336012)(186003)(40460700003)(70586007)(70206006)(2616005)(508600001)(82310400005)(2906002)(8936002)(5660300002)(36756003)(9786002)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2022 17:24:06.0685 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 671844a2-174c-4a49-de00-08da43f387f5 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-pvapexch01.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: SN1NAM02FT0041.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR02MB7534 Received-SPF: pass client-ip=2a01:111:f400:7eab::605; envelope-from=fkonrad@xilinx.com; helo=NAM11-CO1-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-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @xilinx.onmicrosoft.com) X-ZM-MESSAGEID: 1654104479325100001 Content-Type: text/plain; charset="utf-8" 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-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 Acked-by: Alistair Francis --- 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 Sat May 11 12:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=xilinx.com); dmarc=fail(p=none dis=none) header.from=xilinx.com ARC-Seal: i=2; a=rsa-sha256; t=1654104658; cv=pass; d=zohomail.com; s=zohoarc; b=TVRszKruqngl8A8L+hZ7+VBm4OFOK+IGeheNK2s0LGuDujZ/ZENFLKhnVnKsCAbOyrlXO7BM8pypc+e1C/71Vaf+WyRBqHHWK9VqmgeMIYCT4hFosHqTEQ/i97lAnE/WrupuIWoL6nkltIBBE9N9AXG1pb1mtriddMBCzJOHICQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654104658; 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=sUurebytVgqGNUeud3JCSExqdIkheL1R4FKnMDtoOv8=; b=jBanaxIJBgoM/yAbm/L3D5K9hFK84vcw+E9nbePV2FpB+/SAbpdsiDtG1f1EbbkjoEcOm0kAOGE6lCc01o39Nw1Pl3gAcLQ3wvY/kljsDljuEftZ1nuvt4GKHJCtoTTrHgyoXKSdxePP4Vx6PqjEmf8IblxZqPZ52mWI+FX5F6w= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=xilinx.com); dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654104658217403.5028311166775; Wed, 1 Jun 2022 10:30:58 -0700 (PDT) Received: from localhost ([::1]:50438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSBL-0001VT-Qs for importer@patchew.org; Wed, 01 Jun 2022 13:30:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwS4r-0000eL-1e; Wed, 01 Jun 2022 13:24:13 -0400 Received: from mail-bn8nam04on20615.outbound.protection.outlook.com ([2a01:111:f400:7e8d::615]:56356 helo=NAM04-BN8-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 1nwS4o-00072r-SE; Wed, 01 Jun 2022 13:24:12 -0400 Received: from SA0PR11CA0198.namprd11.prod.outlook.com (2603:10b6:806:1bc::23) by BL0PR02MB5476.namprd02.prod.outlook.com (2603:10b6:208:83::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Wed, 1 Jun 2022 17:24:07 +0000 Received: from SN1NAM02FT0041.eop-nam02.prod.protection.outlook.com (2603:10b6:806:1bc:cafe::93) by SA0PR11CA0198.outlook.office365.com (2603:10b6:806:1bc::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12 via Frontend Transport; Wed, 1 Jun 2022 17:24:07 +0000 Received: from xir-pvapexch01.xlnx.xilinx.com (149.199.80.198) by SN1NAM02FT0041.mail.protection.outlook.com (10.97.5.44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5314.12 via Frontend Transport; Wed, 1 Jun 2022 17:24:06 +0000 Received: from xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) by xir-pvapexch01.xlnx.xilinx.com (172.21.17.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Wed, 1 Jun 2022 18:24:06 +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; Wed, 1 Jun 2022 18:24:06 +0100 Received: from [172.21.132.221] (port=53720 helo=xdcsswbld02.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nwS4k-0004Ck-9S; Wed, 01 Jun 2022 18:24:06 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IBzy3LGEF9zYdJYsk5AGF+Q3HruCiL2Rrkj9Cr3cWanuEdB5vVjJD2MP3RwwF3sBbi4RYSqI3e5l993S2FdgHm3XZKZeam+50/uEXLvYkS9yG2z3uFwh99uz5twnDGJDWNOjJ6jQKlXRpXBxfomgVQDBBrvB63Qm8bX+AZUgkAii2S/iwJFA8+wpvmLAA2V07iXHLnKIrgySOHDegWOWDQZY/z6zrKT6C9WeYD/wj/nJ/wArTWBwkzezIxZY/9FxJuSHVLyxmW7/pZxp4enf9n8FUoOXer2gfeZFwFsdtWSXkay6mGs3+K0NESGkU3cH2x+L3cU/WWs3Mo4KjkzqoA== 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=sUurebytVgqGNUeud3JCSExqdIkheL1R4FKnMDtoOv8=; b=TQGam09UjUYWjgSmRXObHoM24LgdIkld3kp08ppFQSTQOMgL16AWV4AR2HtIdypqrwAPDnfJzT7tapoKDCixSkHsK+g9sRX39FH7xpOrLPao1VCa02jsCvitbdM/lvgTMicUjVW6If41gCu8WLb9G0y4EdlgYoQY1k5Eon6igoGrN+SQgUbwXcMNxQSPB4pkJ1/B6jXLuqLC50MTJLTm4vrxMiiPZslJaPBBr/H3+OFPiq4XzEQVFyBInlh1mNIHhHv5vGWFq/rbMlyG3s3bzfeMo+vbS7Cvm/Zifk16jvP03xufpL8kkbdEJHWTVPzN50an5b+Yfw7BKW8OB1M9oA== 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=sUurebytVgqGNUeud3JCSExqdIkheL1R4FKnMDtoOv8=; b=LNck3sMx6zUb1QKItbQMIrFeG+x+C+NGNlai9z2I/yZADdKT5ydt2X7XfXGoHwziz4gl5ikbdZgZhOwMNKEOju0cS+Gf8BJbYEaPF06cKAPIm5Yu1LU4zRW48MHxwasMvFWMt/6ONQ83cZXSazxNKuPHoEyzjLK4BwHZ0tAYuZc= 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 (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 (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-pvapexch01.xlnx.xilinx.com; pr=C From: To: CC: , , , , , , , Sai Pavan Boddu , "Edgar E . Iglesias" Subject: [PATCH v3 2/4] xlnx_dp: Introduce a vblank signal Date: Wed, 1 Jun 2022 18:23:51 +0100 Message-ID: <20220601172353.3220232-3-fkonrad@xilinx.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220601172353.3220232-1-fkonrad@xilinx.com> References: <20220601172353.3220232-1-fkonrad@xilinx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 573c489f-9aad-468a-85d2-08da43f38882 X-MS-TrafficTypeDiagnostic: BL0PR02MB5476: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: 7uqZaHGFmY0JJsmtjG/k6q3JNQ1oEZCtoJ4oVHfLTbWXGlifrpTWATHJoY4cFOllUr4FpCN7JxpaUCJvXD7+75nOQ/+M0bBiQICfQYF4kglQQ0+IACY/ftpnf+ZQiNhxUOzD8HFumRa2oLFRIQyPi8n7m2sWXPemzYACOou0ytT+O7zfmU8JRgtcuYDU0yYnrgqmmiqj9Eildlp3UxLvHCCbRrjJP9pGiFuMJqDXgiL7MP66n8UuojxSbCGwXlNnwSuXRM62ehyN7WOxTl0G4+IWWrtp14VV3SbStCgGrgbXrXjSTtF+OXkt7Z4kQAsGd10WFYTYNqs2bZciRkQU27syqWD7uiOvF0MQw5gTUv93K6cCIPxcl59ZCqCVuEtrm4K1mWk7UO3SC0m3PuWG5VAaQy0U2Mh9f29mjEJog6WmOlVyW2glk9b1uMVuhvTtkTKQ9N1Zgej5EpYB61aI/p6ikFPfwYW2KEu3n8YzVL2OqHhgmcRpVkeg0GQGrwliwWWMr0RvW261A6J2fO0tBTma7jkCEa1Jx4GRW3PANq5H1OsH1zH2DCAImxtGkeHRh0Pw2BRZUSWyfUWmrPdx+1F/wcikewrbT39k5lFGEkTSulgYbHD+hzN7oiTrRB0mHpmc9v1a0ACG1U7J2J7iNDFLfxF/ZxvYtpgi8hGMiOeiluCqoB4xbweYQHZMr8Ea1iGNeyFihjKUIp3OXWAVlg== X-Forefront-Antispam-Report: CIP:149.199.80.198; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:xir-pvapexch01.xlnx.xilinx.com; PTR:unknown-80-198.xilinx.com; CAT:NONE; SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(2876002)(2906002)(508600001)(426003)(316002)(7636003)(6916009)(54906003)(6666004)(40460700003)(82310400005)(107886003)(186003)(1076003)(36860700001)(7696005)(2616005)(26005)(4326008)(36756003)(8676002)(70206006)(356005)(70586007)(8936002)(5660300002)(9786002)(336012)(47076005)(83380400001)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2022 17:24:06.9903 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 573c489f-9aad-468a-85d2-08da43f38882 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-pvapexch01.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: SN1NAM02FT0041.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR02MB5476 Received-SPF: pass client-ip=2a01:111:f400:7e8d::615; envelope-from=fkonrad@xilinx.com; helo=NAM04-BN8-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-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @xilinx.onmicrosoft.com) X-ZM-MESSAGEID: 1654104659660100001 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 Acked-by: Alistair Francis --- hw/display/xlnx_dp.c | 28 +++++++++++++++++++++++++--- include/hw/display/xlnx_dp.h | 3 +++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 0378570459..d0bea512bd 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) @@ -270,10 +271,15 @@ static const VMStateDescription vmstate_dp =3D { DP_VBLEND_REG_ARRAY_SIZE), VMSTATE_UINT32_ARRAY(audio_registers, XlnxDPState, DP_AUDIO_REG_ARRAY_SIZE), + VMSTATE_PTIMER(vblank, XlnxDPState), VMSTATE_END_OF_LIST() } }; =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 +779,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 +1190,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 +1285,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 +1327,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 Sat May 11 12:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=xilinx.com); dmarc=fail(p=none dis=none) header.from=xilinx.com ARC-Seal: i=2; a=rsa-sha256; t=1654104858; cv=pass; d=zohomail.com; s=zohoarc; b=ChqOks8nvJqrxUfb4eSgGQ0u0WOjK3IJ1fWzh02QSnjo6/tMhfL5XW1w0MB8F4ZoK2OOdjuK+v+XBT4z7sC7bDfTrsWzApb1nwZA8EWkN3iLAhMyCljC+qod74YQzqPjiYflRHeF9pb9IvY3okpzaWjMzFt4mknd4i1JbO3vQXw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654104858; 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=6Mzkh11+gPVQv0g+lHelrThmi5so8qNEowi7WN9pvFo=; b=CRHcwnkDVp6v1IlXdB6O94itc5DQCQ5wKM3q9K2VwfksFRz3G1C/goCg5gEwgXciOg/jnKJrIjlIPYvohpz0uk3C81lya6JN/gvQzUd1dvbZ0Ru3nWA7YVtFVVwDU/eWJ0DjLNNhsXwXcSBCbFyNCO47LTG3FWSAN1+rn4LfcZM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=xilinx.com); dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654104858029726.2108373428646; Wed, 1 Jun 2022 10:34:18 -0700 (PDT) Received: from localhost ([::1]:54094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSEa-0004GW-RI for importer@patchew.org; Wed, 01 Jun 2022 13:34:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwS4u-0000oq-E7; Wed, 01 Jun 2022 13:24:16 -0400 Received: from mail-dm3nam02on2061d.outbound.protection.outlook.com ([2a01:111:f400:7e83::61d]:42400 helo=NAM02-DM3-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 1nwS4r-00073X-OZ; Wed, 01 Jun 2022 13:24:16 -0400 Received: from DM5PR16CA0026.namprd16.prod.outlook.com (2603:10b6:4:15::12) by DM8PR02MB7942.namprd02.prod.outlook.com (2603:10b6:8:13::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Wed, 1 Jun 2022 17:24:10 +0000 Received: from DM3NAM02FT048.eop-nam02.prod.protection.outlook.com (2603:10b6:4:15:cafe::4b) by DM5PR16CA0026.outlook.office365.com (2603:10b6:4:15::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12 via Frontend Transport; Wed, 1 Jun 2022 17:24:10 +0000 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.5314.12 via Frontend Transport; Wed, 1 Jun 2022 17:24:10 +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; Wed, 1 Jun 2022 18:24:09 +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; Wed, 1 Jun 2022 18:24:09 +0100 Received: from [172.21.132.221] (port=53720 helo=xdcsswbld02.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nwS4l-0004Ck-TA; Wed, 01 Jun 2022 18:24:08 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R1XufObPPwRqNzrRBr0MQKXvU29ibG5pDTRps34jcLhKO7OW76nx0deiZ46Je2OU6uirXdir0dnpLvZYP+iqyY7S/fbAAxl9sdOR1LEkgdGFiXUGaa5BE7mCzGj4YS/NDUkiysphn3wKnDqAgRzeEFVcKb0ps1LGyBZSLEaMlB0K4tNdOxE7Bn16g3y0qFUzslGwcBIfqH3gWWp3xuaCU2Xb9gqENZ3Eaer5oiosbHz85+zT+eHGMIBeGYOzm0L0G8UDCVDR1Dp3sw4khwcq+03JeNG2IjP3hhxQ7kcYTJDAcj8F42XWTwgYhEitCEFseHwxnfuWlNevpjLpkanp1w== 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=6Mzkh11+gPVQv0g+lHelrThmi5so8qNEowi7WN9pvFo=; b=D2+7MRv/tObVgTH4C1xXxGBvwD+P8ZkjvkIVfZo7rFAfgtBFr6AjMjVBMHWMi+yiVPOu56/P6mQDXZ8l21pZq+OLnluXogIdnuDNQPfGFNnXciinap8VbBLeltGc8wfWqIXmFfZQRKm0qEcQlQjb1Ce9LbxuK/sJUz3k3inWcAqy18081aDb7FsPajgGWwJdWG+3L335kmZOThqqhl9jZKstXP67E7zwa1EvnFsZXrqG5z2TUyCQd/us10wmZaqUEDI/qTzb2nt5QT7RuW3Pw+ORUC8T8Xw6pJwewj2+JOAeTM5L1hllk2PqNt9w8Xw6YYOvrxxH9PphmuToBEua3w== 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=6Mzkh11+gPVQv0g+lHelrThmi5so8qNEowi7WN9pvFo=; b=ddM0S+ZFG6dHkLmSIHWtgrtZxHqBslJ5kZb3MloNhxFDtcHQfaGP9pv1rfrgfPIY0/Wossk8PtO4NKB+SG4tdcZfIJtKe127dRkVJDznhcvWf2dQ1HRS4AQDUQNujXZqAkB/ciTQI1GmMGJD28FTVEMzas/pCfalDmiFsufG0RM= 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 (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 (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; pr=C From: To: CC: , , , , , , , Sai Pavan Boddu , "Edgar E . Iglesias" Subject: [PATCH v3 3/4] xlnx_dp: Fix the interrupt disable logic Date: Wed, 1 Jun 2022 18:23:52 +0100 Message-ID: <20220601172353.3220232-4-fkonrad@xilinx.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220601172353.3220232-1-fkonrad@xilinx.com> References: <20220601172353.3220232-1-fkonrad@xilinx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 706c1e04-2a05-422f-8344-08da43f38a84 X-MS-TrafficTypeDiagnostic: DM8PR02MB7942: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: A1oZqOZxVkOmhFE/HvwHhrS8RGgMhoiwgsrmID3JFzquxrmwrmEHXsUiPErbwOKjjeIbgrvhxD9v8regNjLmZn8BKMWLI10vQ+/6Z4BLupu5N1zQfo6fd++d5bZpjEz9QDQiu6sxElpX32L0aPW4yl9YdoEkJzomsMWfZBjRQjmUiU1+0JVoM4re+HEz7KAjpxfYs6RUxuqjlxXEROPwLS2G8ETQWrMVoiJuYhn7CKz2KIvBKmc5cRYEayRREP0xw2WJddNdfrcLH4U7932xJwpZRfJk8I3dmyTivyOzIXePXwBr/bIny/0nB1fp6zQeAq1o/LnHncQ1qbtDpPWL2Fab9KZEV37GYy5E/6hCEjWKKTcq2/PsZCGdhC5C2yPyqOJ7nwcN1zqCHQ7CEhkBgWukBdQ5QHw4Ac29MjAycajBmiCLqUrK6mMFZ03KEx6AzhGtia6/7GsJqlfE72S9XK9BnDT6/C9T+ihpnIECDySNxtIOIv6pt+6rPtNieIxs5fVsrjN8gSY1FS5FK2eXX+UGEwyCaeMNzBYLW1JbAAjxtVrrFq+htk5hrJmx+P6BcUPVz93yZCKaziWXc6xPIML5Ca6yI159KQNMbbYtc3DHlYK5WlxkzDsNglfSS0qvdDORCme7vw52y+l/lSgbdtjHsUv55CouJhOiX+9ss5h+lt5rn4zgYq5pxZob+nArEIhKPT/2s0pn4LLJN0MKkg== 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)(7696005)(508600001)(82310400005)(1076003)(426003)(336012)(6666004)(2616005)(83380400001)(47076005)(186003)(26005)(36860700001)(107886003)(8676002)(9786002)(36756003)(8936002)(4744005)(5660300002)(54906003)(316002)(40460700003)(4326008)(6916009)(70206006)(70586007)(356005)(7636003)(2876002)(2906002)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2022 17:24:10.4213 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 706c1e04-2a05-422f-8344-08da43f38a84 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: DM8PR02MB7942 Received-SPF: pass client-ip=2a01:111:f400:7e83::61d; envelope-from=fkonrad@xilinx.com; helo=NAM02-DM3-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-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @xilinx.onmicrosoft.com) X-ZM-MESSAGEID: 1654104860018100001 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 Acked-by: Alistair Francis --- 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 d0bea512bd..eed705219e 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -889,7 +889,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 Sat May 11 12:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=xilinx.com); dmarc=fail(p=none dis=none) header.from=xilinx.com ARC-Seal: i=2; a=rsa-sha256; t=1654104660; cv=pass; d=zohomail.com; s=zohoarc; b=C7EvXPYY+NwGGCA2ewA3hUCZ/vobLOq6UBpJkVsVdUyqxW1DzaLWBnF2GscCKeSaaMJ0oTVoNWUXRZtt/CratbJCUXL53umT+n0ZK2ErNpJ9BRgE47QngvjfqUWWAolbzjT5vuNB12Jys4w2S8E/FvXtOe0WedAQ1hx13HM00q0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654104660; 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=40e6uGXZHzMJvmc3JzOaz9ERIYW0+lPfTKNCnEvlhvg=; b=e40Z4+vnESdxTAMEsTvGI3s4NOlWO51VW4UXsIrWr52JNY/mWmzYCUyh25qfjYmK6+o85UlCkLuekkN+9C/1bSnioHn8WONwqtiEL6qCtYRKGYjT9wnl2U1T4hEpm2weqGeY/SchqK0AU7ulOH8/guig/Pkeuiu9CJpMmovRmF0= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=xilinx.com); dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654104660340682.5981828331528; Wed, 1 Jun 2022 10:31:00 -0700 (PDT) Received: from localhost ([::1]:50586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSBP-0001bk-5n for importer@patchew.org; Wed, 01 Jun 2022 13:30:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwS4x-0000xA-Oe; Wed, 01 Jun 2022 13:24:19 -0400 Received: from mail-mw2nam10on20617.outbound.protection.outlook.com ([2a01:111:f400:7e89::617]:33120 helo=NAM10-MW2-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 1nwS4v-00073v-3W; Wed, 01 Jun 2022 13:24:19 -0400 Received: from DM6PR06CA0040.namprd06.prod.outlook.com (2603:10b6:5:54::17) by CH2PR02MB6229.namprd02.prod.outlook.com (2603:10b6:610:1::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13; Wed, 1 Jun 2022 17:24:13 +0000 Received: from DM3NAM02FT057.eop-nam02.prod.protection.outlook.com (2603:10b6:5:54:cafe::c1) by DM6PR06CA0040.outlook.office365.com (2603:10b6:5:54::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13 via Frontend Transport; Wed, 1 Jun 2022 17:24:13 +0000 Received: from xir-pvapexch02.xlnx.xilinx.com (149.199.80.198) by DM3NAM02FT057.mail.protection.outlook.com (10.13.5.64) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5314.12 via Frontend Transport; Wed, 1 Jun 2022 17:24:12 +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; Wed, 1 Jun 2022 18:24:11 +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; Wed, 1 Jun 2022 18:24:11 +0100 Received: from [172.21.132.221] (port=53720 helo=xdcsswbld02.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nwS4o-0004Ck-6M; Wed, 01 Jun 2022 18:24:11 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LOeYMhuGNywE8oTESq/zdhNVtzfl04zyiz8x44LKcpWoC/t82hw9gXacIdI1L+g/lVdQN7co4FnlTucon6MPsY7h/GYle7Jdi5hUf3wnZ3q3aGJgmyD8r4QNDiKL4rscG8McCCZs/O/sh3kqA1HNirESqwuFJKyEc2zN/ZkYF8rNQqsQimitWvHUiHJqXqcURFwXec9pVYY7Iv8yxxmcanTjmS27lQu12uBQeOkICmj7IEfY2Q2bU2+oJPudJTwnT5tWQzkGKW36QTBPWIeYl/3ryfFCIpkxtNQq4iBqsBIz5w4qcc2uo8eb4s/1a0aUTd8HXtA83mRSHiE9MB/hDQ== 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=40e6uGXZHzMJvmc3JzOaz9ERIYW0+lPfTKNCnEvlhvg=; b=bmOBWiQ2DPYog8ZyB7fZHO6vDswZqPWY/xRv+SD53qIlM/3f5A+YaD4xJ8QXWsdGu94HDCfZaZOATMPRycSP/wT/PIHs6t/BexqBDqtvLk3niK45zBSOGx+U0B7slxquioeM31SwsX1QlXwomUOzSvsSO6pEl4U+VNMh+j7NB+4IJ5NXa5eqbEDGee+/W2MpHtTKd8gHKZ80c85RpXUWCyvmB99GRQGVcx8CSyh4rmhDUB6pXdh1c3K57xqL9u4FqY+ci1Z6VXp9VqCwxNz7fNFNx3XQLnBMF38cWwyxkBaCayFOGc7fygweM/tmnII2076JpEiwHdzDughu25L/pg== 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=40e6uGXZHzMJvmc3JzOaz9ERIYW0+lPfTKNCnEvlhvg=; b=XBUyzIzTYsTIID2CgjrxyGE4rUpLpF7sjlux615Yj5/M9hrxpnx5OcKLGdWcqaMu1QTxeXqk46/7u6xc+EIAGcrHUr4NOSO5FB2DkoLJum6rakcV7OT5r/HweHqml3J4Djal59CYA54UMZv53+gQxuvOCqZljruDRTPLmRh98k8= 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 (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 (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; pr=C From: To: CC: , , , , , , , "Edgar E . Iglesias" Subject: [PATCH v3 4/4] xlnx-zynqmp: fix the irq mapping for the display port and its dma Date: Wed, 1 Jun 2022 18:23:53 +0100 Message-ID: <20220601172353.3220232-5-fkonrad@xilinx.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220601172353.3220232-1-fkonrad@xilinx.com> References: <20220601172353.3220232-1-fkonrad@xilinx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fdad54b4-cbab-40a0-4808-08da43f38bfe X-MS-TrafficTypeDiagnostic: CH2PR02MB6229: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: QROWk8btfgO5AjhnSu/4m4RbaLNZCGxMv+Psz7k2jhVo+DRsno21mdy+gwW4g+AKJKkIoLm8j4U+KOpHD+RKx7SZlAsBmEgaWiL6sJh0OA2+/XY11VsvpDyJVaZyF/9/RYUS9OxOPCMor8J/tSDcIYo2KCbSlaNukxJphu1rSTTa4Z7fhd+M555D5/0P//3M5ZQ73cpWSqNFu1wafEyMvi4QfD3VWQHu9roRKRF3njUOl1kBeJBLX7eoOGHwiG3TSh6iTyqvjfxTBwKVdB+QljkCIwHSET0l9vTd9bckJ5w5lqrd1begolHlf8e/uCC1Z1/yNlBL9hlg6N5vaYyAmeKQqONiYa4cltS2irB7Ne2AgVoCibgs8P1bbHaJFgNsIK5jFh7sunjM8AY2ygdQJb/MumlbqUNQBV592KAHEFbR8Rfh1kGGL1dAmm3aCjrwT4bUBqBWuejlwnEZmXzRtMmvmZ5GnNnpWuIXIMjiYt2nNcs2cZFbOOc8ySLdR5s4p+qpJ/5Bke9rKLTupGhfIbYVZmSOlJVrcqj4Smyp8UQ4ZrzlnANAPv8FcWRo8hWZeKMcc1bfVASjXhFY3JQkMaplc2WAqsHrnAuGbyxfEKJYRm7e46pcQHt4vAgcRmweUs/MvzRxNDDSQBjO68JjWqQqszONJWekkKt4sbLLAk9dIFeBjuEO3a9hYzYDhy9WeEP0gsN3hQEjIvUscFO2eQ== 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)(36840700001)(46966006)(2876002)(36756003)(40460700003)(36860700001)(336012)(426003)(47076005)(186003)(1076003)(2906002)(7636003)(8676002)(2616005)(4744005)(83380400001)(82310400005)(8936002)(9786002)(356005)(6666004)(70206006)(26005)(316002)(7696005)(70586007)(4326008)(508600001)(6916009)(54906003)(5660300002)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2022 17:24:12.8970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fdad54b4-cbab-40a0-4808-08da43f38bfe 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: DM3NAM02FT057.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6229 Received-SPF: pass client-ip=2a01:111:f400:7e89::617; envelope-from=fkonrad@xilinx.com; helo=NAM10-MW2-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-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @xilinx.onmicrosoft.com) X-ZM-MESSAGEID: 1654104661506100003 Content-Type: text/plain; charset="utf-8" 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 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 Acked-by: Alistair Francis --- 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