From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7820EC3F2D7 for ; Tue, 3 Mar 2020 18:16:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 53A6620656 for ; Tue, 3 Mar 2020 18:16:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="F+G/Xija" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 53A6620656 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8DDB06E93A; Tue, 3 Mar 2020 18:16:43 +0000 (UTC) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2054.outbound.protection.outlook.com [40.107.94.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id D71816E506 for ; Tue, 3 Mar 2020 18:16:41 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ekWDKC+GlcB5uf0Lcq8o20ZIIcueifXAtLoQ+Gi6K4IoNwVxTJvK4kuOlL8MYO/o3RG+sey29GeINchN1eVupcgnvPQ2r4VUjCFfUzyOO6JZyloWXjDUn6BuM9mCHwHOUJYm260DU5OdnACWIkTN9chIMxDf6sYbez/yW7/wSIlENkvEnCHd+OY2VBCoMACfzpJ+otbC9h1TiY5SKJL2phhJY71g0cRG5HFWEK9mQpHxEU3kM+akEyy9ytH1tU8Tzm108pn/973ZvB1i11O5ZpsSVvKP5BOsqbRWJd+AGxPh+xI0sUNL8I7yuqesFzF+jxBBAQTqBKQ0qkTls28uEA== 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-SenderADCheck; bh=3ATEgNsFfE6i4jGVWzGDc2n4Xh+GsQx9Ofu5ob/me1w=; b=ig+qTd8UuLK3+6ViKP+zpn31am7sWzn19VYZVFIqCXZCtb+v+/Kt1nXxCLoofNFO2WBQn36qeUx7qFbK/n77RBMCo44muAkt68mEDVvU5HN6zGDa6kYAO3dWHxfCt6dd4Q2V2Mz59dqn2rempvmMIi1CTPOFoAFSNmuBLl+Rt3EhwOx48XZltKIJwWhXKR2W/P6HG3roLGo4ftlsobiUWZYYJlZDB+C+rUXaWb9c5OCuzBcJ5Ov+a9NRGOWusBiUHngDX8VTS8cXRvMixralToZAMlKs0DIAUCUNl2BWS8YFszHBlxNyBEJK39ZyJFt/r9Yjyx9zDzx62Yp8KE6E+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3ATEgNsFfE6i4jGVWzGDc2n4Xh+GsQx9Ofu5ob/me1w=; b=F+G/XijaVlrzEGvqkBDIK9kJP2ChBfuJcORkbJZowxRiF/9xv5fHGODyP52CSdS+zWkB3LYJJ7z9eFO1pA/6Hs9NhlhXPUxfw329cQV1CDgn9uccjIwx1B7uzHX1hhjz15pZ1QIWY83/XDhYEvNmSjC5ZPcdZ+B6hV8iKZfTdSg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=James.Zhu@amd.com; Received: from BYAPR12MB3285.namprd12.prod.outlook.com (2603:10b6:a03:134::14) by BYAPR12MB3382.namprd12.prod.outlook.com (2603:10b6:a03:a9::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.18; Tue, 3 Mar 2020 18:16:41 +0000 Received: from BYAPR12MB3285.namprd12.prod.outlook.com ([fe80::7827:1c37:4c53:b74b]) by BYAPR12MB3285.namprd12.prod.outlook.com ([fe80::7827:1c37:4c53:b74b%7]) with mapi id 15.20.2772.019; Tue, 3 Mar 2020 18:16:40 +0000 From: James Zhu To: amd-gfx@lists.freedesktop.org Subject: [PATCH 4/4] drm/amdgpu/vcn2.5: stall DPG when WPTR/RPTR reset Date: Tue, 3 Mar 2020 13:16:31 -0500 Message-Id: <1583259391-21834-4-git-send-email-James.Zhu@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1583259391-21834-1-git-send-email-James.Zhu@amd.com> References: <1583259391-21834-1-git-send-email-James.Zhu@amd.com> X-ClientProxiedBy: YTXPR0101CA0052.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b00:1::29) To BYAPR12MB3285.namprd12.prod.outlook.com (2603:10b6:a03:134::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from work_495456.amd.com (165.204.55.251) by YTXPR0101CA0052.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b00:1::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2772.14 via Frontend Transport; Tue, 3 Mar 2020 18:16:40 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [165.204.55.251] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b05352f7-ef15-44aa-a325-08d7bf9f0542 X-MS-TrafficTypeDiagnostic: BYAPR12MB3382:|BYAPR12MB3382: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:186; X-Forefront-PRVS: 03319F6FEF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4636009)(396003)(366004)(376002)(136003)(39860400002)(346002)(199004)(189003)(66476007)(26005)(2906002)(6916009)(66556008)(66946007)(86362001)(186003)(8936002)(52116002)(478600001)(81166006)(6486002)(316002)(81156014)(2616005)(5660300002)(4326008)(16526019)(6666004)(7696005)(36756003)(8676002)(956004); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR12MB3382; H:BYAPR12MB3285.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cdNXqKpPv61VuM5x3SOvsexfYvRAngtxi6fEN1BWlgvfRFWj2JMB+JHBuziEFNFL4dZJ/Qxt4ePLile6fqSvKQg++Z6AuejciUvobxlPMDV4DcuQp2pvKBDMbJhzl45GfDSyZF8NQx4+p4kK3O4FclzYMkJLoeKc4WxKCu07/tEFSCdIMwp5lIWks2lYoCaeC3m7cxjIKD1qC06UZAdY/uskvEQyHGctg8WhGBZBOpJVY4AHyztfQRjvW5XwBaROJByOmOrtNwYOs0gXc994G8oCmnG1lFMIH1a0EB/p2ZGrz1cxyifD18i8wwSB9py9fkeSVxH8lVUmzxGlU0+y9e2Bawm0m6fpPHQWBQGgQFyUcKRmCDpv6WHhHEwy4Kc0NvI35+0XHrKnETbK0JtlJqf8ZK1cXgDhPg+rHRNu54xnn9qWlwEIbQ/FN54weVzi X-MS-Exchange-AntiSpam-MessageData: YBrVYeWgKioeznaT3s9x8QWd6GrIOn+u1g1uMRCB6yhWtktylAkBiu/hMwuEFRE8JV6EizoejunQz6IMaBl1RR0mp8Kn15OqhUHjfF/T9V6UywP7WJwhXFl4IY7RNIXi8gROGY1Z3+QhkoJ/uWgpuQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: b05352f7-ef15-44aa-a325-08d7bf9f0542 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2020 18:16:40.8191 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7o6kIMXHDbLP3eYWpnZd38/xFG+JJizZ9okjOJPHAJmR9emHaqmD03+rNFRgVHa1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3382 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jamesz@amd.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" Add vcn dpg harware and firmware synchronization to fix race condition issue among vcn driver, hardware and firmware Signed-off-by: James Zhu --- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c index 2d64ba1..189c816 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c @@ -1388,8 +1388,11 @@ static int vcn_v2_5_pause_dpg_mode(struct amdgpu_device *adev, UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK, UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK, ret_code); + /* Stall DPG before WPTR/RPTR reset */ + WREG32_P(SOC15_REG_OFFSET(UVD, inst_idx, mmUVD_POWER_STATUS), UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK, ~UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK); /* Restore */ ring = &adev->vcn.inst[inst_idx].ring_enc[0]; + ring->wptr = 0; WREG32_SOC15(UVD, inst_idx, mmUVD_RB_BASE_LO, ring->gpu_addr); WREG32_SOC15(UVD, inst_idx, mmUVD_RB_BASE_HI, upper_32_bits(ring->gpu_addr)); WREG32_SOC15(UVD, inst_idx, mmUVD_RB_SIZE, ring->ring_size / 4); @@ -1397,6 +1400,7 @@ static int vcn_v2_5_pause_dpg_mode(struct amdgpu_device *adev, WREG32_SOC15(UVD, inst_idx, mmUVD_RB_WPTR, lower_32_bits(ring->wptr)); ring = &adev->vcn.inst[inst_idx].ring_enc[1]; + ring->wptr = 0; WREG32_SOC15(UVD, inst_idx, mmUVD_RB_BASE_LO2, ring->gpu_addr); WREG32_SOC15(UVD, inst_idx, mmUVD_RB_BASE_HI2, upper_32_bits(ring->gpu_addr)); WREG32_SOC15(UVD, inst_idx, mmUVD_RB_SIZE2, ring->ring_size / 4); @@ -1405,6 +1409,8 @@ static int vcn_v2_5_pause_dpg_mode(struct amdgpu_device *adev, WREG32_SOC15(UVD, inst_idx, mmUVD_RBC_RB_WPTR, RREG32_SOC15(UVD, inst_idx, mmUVD_SCRATCH2) & 0x7FFFFFFF); + /* Unstall DPG */ + WREG32_P(SOC15_REG_OFFSET(UVD, inst_idx, mmUVD_POWER_STATUS), 0, ~UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK); SOC15_WAIT_ON_RREG(UVD, inst_idx, mmUVD_POWER_STATUS, UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON, UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx