From patchwork Tue Apr 6 01:46:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Kuehling X-Patchwork-Id: 12183951 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,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 520A0C43460 for ; Tue, 6 Apr 2021 01:47:32 +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 17AE661396 for ; Tue, 6 Apr 2021 01:47:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 17AE661396 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E9B466E23F; Tue, 6 Apr 2021 01:47:02 +0000 (UTC) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2071.outbound.protection.outlook.com [40.107.94.71]) by gabe.freedesktop.org (Postfix) with ESMTPS id D71C56E1F4; Tue, 6 Apr 2021 01:47:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QTH5zhh+YdbwCiaS2qM5uIxcEZ+Yi+NgEPsfA06XHN3t3Iu8hGt2QGhb87FnJlnxIzsuE5SuvOV/oFG0OxprwwPe3LwySM8k0UIBfEN6VhGfUFWG4wb16oBZOq8wGc4jds93VN1JTEjyqPsTbl6t1WQSe3aR2r1AyY6nY1KvQy1oFCG+uQlQRvBoLggXH6vQzsojvs5jNr3oNC9+DINXeF1CYJHK2cZ0Y13iUIPOSJis4OvhMOG5FPPikx0/3tmOiSslrYvOiya1+Iwtw/WnJ0DYLia/E7MCq8GeSSpa0afjtbvXVQ542aPagaiFeANonsGzkgCUgBHGQYjK1USoyw== 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=jV/9ouWm8Z1a0UoziDxPQEmdaKXLEl7Qb0r8Xx7JinM=; b=kscKHhX9xsS1UiWQINj0zsalGpJqIpU3xoGhUzCwdp68Yd7DZKYB57pe9833D7fJ2MTL8ak4QM+wFNYowpr+Fq4ku2IrjT9q9octWERierZajXrmoVrGujVGfiMhQwoVYKS1oiuLkaO+tTZW6WGH74M3llfQVXEtuS/9cu3ZChjzhPGT7ddOadUjAvQ7K7pRCyad7uIlqwHo4wwBG+mGNdk4dqgBLk2mNiLzt7OPRj6/pg9NEzZau0dbeHQCSe2hZJbLOoq084okzr8rGOmXIADPBMUzsfKxHVsRK/2zDeVtPKjc0+BWHIVTszLevkXUZUtWfF53/v4/mdpYMp8rTA== 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=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jV/9ouWm8Z1a0UoziDxPQEmdaKXLEl7Qb0r8Xx7JinM=; b=F0v3yDVBsv6uNYpKfDnpBaiCSpSH8VEHdCVn6+YCKXykNe56NmJUEmJlAPZViweuZq46zNZX3OpqC4q2r2E/lJ5FWu4Z2hCMveQpNSRXnUoFxAGZU31fAYmBw21zPTedvRRMt7Iut/WVkimCw9WpRIKlATSk8fzHXKeGC9CcuGw= Authentication-Results: lists.freedesktop.org; dkim=none (message not signed) header.d=none; lists.freedesktop.org; dmarc=none action=none header.from=amd.com; Received: from BL0PR12MB4948.namprd12.prod.outlook.com (2603:10b6:208:1cc::20) by MN2PR12MB3773.namprd12.prod.outlook.com (2603:10b6:208:164::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.29; Tue, 6 Apr 2021 01:47:00 +0000 Received: from BL0PR12MB4948.namprd12.prod.outlook.com ([fe80::70f5:99ed:65a1:c033]) by BL0PR12MB4948.namprd12.prod.outlook.com ([fe80::70f5:99ed:65a1:c033%7]) with mapi id 15.20.3933.039; Tue, 6 Apr 2021 01:47:00 +0000 From: Felix Kuehling To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 12/34] drm/amdgpu: Enable retry faults unconditionally on Aldebaran Date: Mon, 5 Apr 2021 21:46:07 -0400 Message-Id: <20210406014629.25141-13-Felix.Kuehling@amd.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210406014629.25141-1-Felix.Kuehling@amd.com> References: <20210406014629.25141-1-Felix.Kuehling@amd.com> X-Originating-IP: [165.204.55.251] X-ClientProxiedBy: YT1PR01CA0071.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2d::10) To BL0PR12MB4948.namprd12.prod.outlook.com (2603:10b6:208:1cc::20) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from Harpoon.amd.com (165.204.55.251) by YT1PR01CA0071.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32 via Frontend Transport; Tue, 6 Apr 2021 01:46:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0483d39b-6706-44d5-e225-08d8f89dde3e X-MS-TrafficTypeDiagnostic: MN2PR12MB3773: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c9W4uMQFa7xrabscCXLpOfVN/1HkE+NPZIzVIZiWyrTNrbbavUI8QBwZD+daRUd7O07m09psjnk2FMESps5Y7smz8mxg64/GOTud5Nik91exDo1w+3GNUPVBIIylJlil8WpKHPd5qC4ed98+LQGDp3sTrKBNXHoFkIEoTTJ5dXs9aJWIY5me5QMWAwjDk96pAVsogPUXniz3dRPstdKevR0bIDADhNr8UD7E6aZ05cdqKcHxp5e0/w2PMqwnHh6rNphN6JZfgfBq4hxU0M3F/x5tGDIwR5CV5gHtwAq18brTgz/MrWugH1igZ6AQRYFtpzAobJeO8a1fVlJuiIc1xMCxp6VLV/8+aczpAvnAuspKRNywfitx8Fg6NXLT3OFXnCCpCqp53zp6hbNTqucYt/qP3kNgVIgpbbx5wO4x11t+VH6KZyp8kJLTIxChzOQINfJOERJeoLkT967cYFfH9DsgUUfSfnl13QxJ7Ve9rzBWYZm8KJBZCupTUCV3mKUGU9hM4gpY2HNYFudBnqQhLI1nkZWX6OTEuQD9KH6SKhq3azYecxPgBp0fcjY6O5BZtYwlkRNsmXDUTuNvqwC9fRDQ5m/yWJfwyr93Yod/TuZuujd4EaYPB4EAJ278qroG7PBVn3Nm+slonuRdJHHecLVvwMOMB5CooZVktqQRG3juoAgEP/tgQlfYW1zSVPyS X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR12MB4948.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(376002)(39860400002)(136003)(346002)(478600001)(5660300002)(6486002)(316002)(52116002)(66946007)(1076003)(36756003)(2906002)(16526019)(186003)(26005)(450100002)(8676002)(8936002)(86362001)(66556008)(66476007)(54906003)(4326008)(956004)(2616005)(38100700001)(83380400001)(6666004)(7696005)(38350700001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Ql8+JSt9SVrVya08gul2NuwOpH1SMN2988XOl+HGpCAgRzUUx1gSjOEX5kFGDo3cPuigXziGZ9Jj+EGWunrBmIXB7GUy9RoyXDv41xA8kIg5s+sVCyEO4GGmCX5GEQIYuy3RfLsNfZwobN8+Ii9qwxqUd9tWKy2ewnZQS6EqK0VQn+XmMxVDCRV6k4/bDn5w+lGbcuiiVHXkNWnfWejMwZTXDKfZWFtPlg2V/Pee7XnHqgQCsmjTBsW2OEEkf2ojgy96fLEV4g3gjSj+uKClHsIm8lLvoRQcyBRp5UURap1hDATanwx1yjqt5IRU1sJol1x0KRhBXbkcj8HML0MO8FDhyTJEZ7ivZKcfdgDqshQWzApztiVExo9u9oIg5mEyPkfP+FX/VWj+SZNaUjSEQb0PbnafaX5v9G7Nj1ouUQMDLiWXFRNd8r5XCUyFZH9BMU7EklVYwvB+FW2hoyUUICDtf+Pf6B3b7+ojlobF/OTkEcqhM0Zb2FaahalHrexekrjrInoElOM+cCcLa95zjh4NN7Xczis5xArHrkJpVQHVBvPVj5pD/gZc0Fkdj5V6I2PqZMI5HouwCQJ0ZUOP+xksfg1LzBMaWaeRbblI+T37Z5hiLtd12n6oouvO3n1qYnl2fqH2rfkFKIuAuqhJJVficBt99vxJ4CU5kIWiHrEYvL3Fhdt8lGE7tYg7msT5FLcXXlsA8ebyzv0oF7pYxFittQAjxExibESnLDGylCIXYc18U3Tzn9nBtnCvcfKPvxoe/p57FP9aiMzVoTxacIDw5cpn5iFvMxgQYZJ/vV41uC5sgggyJFw1+orIr2IbvXeNwIaLZnoZvDOSQCnHZB+wYl2HQI5/Gp+UqmoqS2RI7WFzq3+SmGhnlEl9z0X/7gBjL+o8lMHj0ocE9AzM1yddz/1FDIKYNrdRQiJU49hfmNUR1MY68FkrM6FTDjKxiYQgBbZgAhByAblFpJv7nWeRUEVhFAxS+Kp1JcIx1oAgBZGb2SAVp2gbE8mw5a2kNshoJZ3Ixy1WFJW0/M21kdv2pL2+wQipk+JR0nwEpO53Go6vAT8sAW6czgibg+5XvkxfW2+pFH4sJa1rKGo3wm+bVDsqReqVGTPrA8OODKR059awtcJjOoK6OrCVptJoxTZ3oZwk62U3RKhzc2ZSCrLgkgRPhhXgEiN9spHUw0rXyvzB7n3eUuFu7shVoTSICeb9lVYkDPFY5WBDbEJI9TANuKIMU5omHj0cl+qmScMaQXNx8JSMg5s6fbWjsxYNmwHe9/fT93G6xICJ9gxNyNQmTcCrInisMaX2X2LW4OJR36udhGIJPTuZiLY8gyvR X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0483d39b-6706-44d5-e225-08d8f89dde3e X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB4948.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2021 01:46:59.8477 (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: 7A0K3LxRCML+2f/bYFNRI6HPEEUJSA/skEb07MgqzHGwMGiBKFrReTsBuEouQm+gNIOh1BRC4NxsehLr+bppRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3773 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Sierra , Philip Yang Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is needed to allow per-process XNACK mode selection in the SQ when booting with XNACK off by default. Signed-off-by: Felix Kuehling Reviewed-by: Philip Yang Tested-by: Alex Sierra --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 6 ++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 4bcc03c4c6c5..09f88874bf56 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -640,7 +640,8 @@ module_param_named(mes, amdgpu_mes, int, 0444); /** * DOC: noretry (int) - * Disable retry faults in the GPU memory controller. + * Disable XNACK retry in the SQ by default on GFXv9 hardware. On ASICs that + * do not support per-process XNACK this also disables retry page faults. * (0 = retry enabled, 1 = retry disabled, -1 auto (default)) */ MODULE_PARM_DESC(noretry, diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c index 5bb9856bd8a9..f2fb2cac5c77 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c @@ -292,10 +292,14 @@ static void gfxhub_v1_0_setup_vmid_config(struct amdgpu_device *adev) tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL, PAGE_TABLE_BLOCK_SIZE, block_size); - /* Send no-retry XNACK on fault to suppress VM fault storm. */ + /* Send no-retry XNACK on fault to suppress VM fault storm. + * On Aldebaran, XNACK can be enabled in the SQ per-process. + * Retry faults need to be enabled for that to work. + */ tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL, RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, - !adev->gmc.noretry); + !adev->gmc.noretry || + adev->asic_type == CHIP_ALDEBARAN); WREG32_SOC15_OFFSET(GC, 0, mmVM_CONTEXT1_CNTL, i * hub->ctx_distance, tmp); WREG32_SOC15_OFFSET(GC, 0, mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32, diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c index d0f41346ea0c..0d278df12863 100644 --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c @@ -298,10 +298,12 @@ static void mmhub_v1_7_setup_vmid_config(struct amdgpu_device *adev) tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL, PAGE_TABLE_BLOCK_SIZE, block_size); - /* Send no-retry XNACK on fault to suppress VM fault storm. */ + /* On Aldebaran, XNACK can be enabled in the SQ per-process. + * Retry faults need to be enabled for that to work. + */ tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL, RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, - !adev->gmc.noretry); + 1); WREG32_SOC15_OFFSET(MMHUB, 0, regVM_CONTEXT1_CNTL, i * hub->ctx_distance, tmp); WREG32_SOC15_OFFSET(MMHUB, 0, regVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32,