From patchwork Thu Apr 1 22:29:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 12179757 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=-21.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 4DE79C433B4 for ; Thu, 1 Apr 2021 22:29:52 +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 DC254610CC for ; Thu, 1 Apr 2021 22:29:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC254610CC 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 223886E02D; Thu, 1 Apr 2021 22:29:51 +0000 (UTC) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760041.outbound.protection.outlook.com [40.107.76.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id AF7816E029; Thu, 1 Apr 2021 22:29:49 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PdObXsduAJaEvJCu/JU/ZjI9EI1XEOx6NMFZrLjs4YTvAb7jos/F4peQWKcoGNs7mxK47J/coHTz8qZliRbaQLcSxaiRicfiXRpuYC4if1WCXaX+bPVCSyscV//XcqL7mtjaGin0o7Q65rdvpGrxVBtcs6pnipiYm0lqgOwyO91he+pAcqCVj1Sb6Uh7TId9OUd9npdbma5mvZM9bMCqMZp8l2T8CAHZnWKYC5t0hTXmwPrp9/x7+yuBVjxSpv9WOFP3sQyzXf3mEjVcLsLkS+GglFcnJdmFJeRr6PyVLrmD8pWZwuNY8f+87JMqNGTyJM7DvxhpXqXG7LQMEAdpUQ== 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=D1Cy6Y5kvzWCnHeJtSP7b/8qaNFaOb70Bzn7XvZozrw=; b=GUmak4eWZDhJTd8YHMxUoJokzBdcsATGU9zmBXGKpr9fDH/23AruzQbSYz9097BtqSsr+hW9PQvCFp+9LNZBxQfAYOCS1rn6iC276pAGMANu5qhaYt+WSPevTqvX/ugXGdjiZZNOFV/xBleuC5oX+kFo1TpNhCwnTpVmADA4YqGUJfQLocbgiXlPZe3gsSlsIzTijEAmQq27iJ+WpcL19qUP7uuaxqmQT65j4MeoBdCKsixslQVW1EKSc0wCyUdTrgTjjLHI9PXjCNNJPm4TXuH5rDm1q3kmt5owwWSoRbutWDHuqCP+nl14vwzStCfDNB5kLGtkL5Z53VOGVLMbkA== 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=D1Cy6Y5kvzWCnHeJtSP7b/8qaNFaOb70Bzn7XvZozrw=; b=OMBQq/W4umvw+/3COAZuTuIeRTU/W2s146wCZf5k1gQMKAkSKMjb3/ZYiWWMNhStvzQEscq1bGVDMWZaTkWT/IULAMXwIC9KVUdhkQz6YNwJaqYdKhUL8DCjtnnOr0HXMQFZeDrbhbXtwvdTXQtvapy+vEVnG+OVYouWla2jiDI= 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 MN2PR12MB4488.namprd12.prod.outlook.com (2603:10b6:208:24e::19) by MN2PR12MB3759.namprd12.prod.outlook.com (2603:10b6:208:163::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.26; Thu, 1 Apr 2021 22:29:46 +0000 Received: from MN2PR12MB4488.namprd12.prod.outlook.com ([fe80::3d98:cefb:476c:c36e]) by MN2PR12MB4488.namprd12.prod.outlook.com ([fe80::3d98:cefb:476c:c36e%8]) with mapi id 15.20.3999.029; Thu, 1 Apr 2021 22:29:46 +0000 From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, airlied@gmail.com, daniel.vetter@ffwll.ch Subject: [pull] amdgpu, radeon, ttm, sched drm-next-5.13 Date: Thu, 1 Apr 2021 18:29:31 -0400 Message-Id: <20210401222931.3823-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.30.2 X-Originating-IP: [192.161.79.247] X-ClientProxiedBy: MN2PR20CA0047.namprd20.prod.outlook.com (2603:10b6:208:235::16) To MN2PR12MB4488.namprd12.prod.outlook.com (2603:10b6:208:24e::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (192.161.79.247) by MN2PR20CA0047.namprd20.prod.outlook.com (2603:10b6:208:235::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 22:29:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 05bf3ced-636b-49ac-bbae-08d8f55da71e X-MS-TrafficTypeDiagnostic: MN2PR12MB3759: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:172; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Up/qU7Mt0D6UDWZSHcXuQJiDrryuR90IDEeF+fBrfo7qQ7dM5ZzjRDAEie7pGiwd112TEdl6frzUA0T7k35PNuQxYulfqTNurYBqmtD2etbhsMFGiqOGu/Idg4oQrh0p/DT1LrezeoepC+TK9F390ylZkziskIQIS3vESrYmxpMd/MPjlZLHQfiWKUbv5TfIPTBbOldzqG0qJgayMDd/kKfTXHTEVZXYPEZ7QSnE8u5lYfpVqhuH/bOF+5Nbkp18Ao49RGmcUq1vYeOidnhsJBOVB+fRipIspcGicnA3N6Wt4IcmRWWsa/4mwHALWs0Ytel5qbhkv1vrzkmQlSj03GghDZBPbknPmv7YHTy5N3B+oQ7lRAxerHs2YhRDPsYoChaK5zDlEMveQ3tbYICKlprksrbHzuYCTjl8EHDYT3cc+5yGngmHFeJo+GHF5KVOHb3UBtuoJlaoLMzJHh+gRd3+N9S9LEt5qYnJkzeW0w4TIVaoA9UQk+8EARl1pHYQ+mTq6b/LsaqWTazzHI1/BXDhqa3MExdiHhW77yZZSWeUWlTA3f6MyWh4G/Gz6D0nmfk6MYauiwAHWcTDyE211zOcvCQatwehZLUdSRA+I+89+dFvwErP2ynE9hY96MriDXAKP+9M+7qZwwa+8tHjN/usp8JfYPSYO8asXtUIqN3wk1jB2ow4AzmxWHF/egJC X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR12MB4488.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(39860400002)(376002)(346002)(366004)(396003)(4326008)(186003)(16526019)(956004)(478600001)(26005)(6486002)(36756003)(38100700001)(2906002)(8936002)(6512007)(83380400001)(66556008)(5660300002)(966005)(6666004)(66476007)(8676002)(52116002)(6506007)(66574015)(86362001)(1076003)(2616005)(316002)(30864003)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?149sJNAv4OhpoCLN86+WLtn3Ih4l81?= =?utf-8?q?8GGfJ0PA4Ou4/FlpM5/y1rpCrUJWccF1YzjdXdzrzhWHq0FLtpcpUmrvhoYF03E9O?= =?utf-8?q?YzKrij6EO5FOu1OgSNhiJv67jVR7F43M5MgxMM9mmORERb2rcJgS4CjVrhGa3cQqf?= =?utf-8?q?XPJYTQOz18545cwPEL6N5nsAmCM2PnWh97FxEf6vdNV5y5e1MfgDEBqMK4mKWaG8S?= =?utf-8?q?eK+Xi3YS72Kq2mq25WgFcBev2BYi4UdDlU7h1jyav6DClPaXza9OGXSw5khrINCJl?= =?utf-8?q?Sn+zfuffRBGiHMmkGjKe/QSJ0sEI9sRZk+A7kuVLO0BO69sJnwNZoARu8atcA+kBD?= =?utf-8?q?uk/+uZ5gFszWLdaxwzOlAYWkxBmYDkmws374nLooKlrnLim+fWxWp/lztADzlKMK3?= =?utf-8?q?etwECchqqd0uw7Zzp3xRo7GblyGcSWTAum4Y6PtiogWt9n6b5J+jP+QVVPTVazlQ2?= =?utf-8?q?Q4QkVyCTjzsvqEpIiQygoP/Rg6hOXWafzwv+VymMpFZ5VJ/D6kACyDKcZpYcH+t4k?= =?utf-8?q?P40bV2o5oA1tXfVOrki9FYABULcIt9dalp7ROLKvLpbFrTj+jVWxUvgLWBcicNVPX?= =?utf-8?q?xGpCW/WFdTQCECiyLWSLqgzhIIQvF+S7Gs/fe8b5aV7QtjFQQ94XqgtQeL7ps5hyd?= =?utf-8?q?67oJ4s8NSIiubDAwuqE4PrTs6Vfw6ldlR5jrf1FSwp8YUvC3+GYrw2PkGjSz1JvfM?= =?utf-8?q?b23kmdWactNo/Br6G2tnINFXwzSrItzR5uGBuqYEhqA13Y8D6II59sxOUWHqiJwmK?= =?utf-8?q?Rgl7ehd8vEmJ+fyD6UYUJmRrC6hyMP1VZgze30ZzUBsGko153heNwiE9qa5dfrStd?= =?utf-8?q?shrUxz3HVTMESYOUd4Xg9kEqug3eMxGdSNc+6Y3lTb+WAtbeQDzkeCoFk0akH4G+X?= =?utf-8?q?6woq60is8lanS+DaxLqmE2jse8dG84XmMhL5TSSk+KfWMc9Ec1uEFnykVgwcUKc/s?= =?utf-8?q?hpTZO5nDWlnkW3jzQZ1j5AQKW0ANQAm8yb1j3+CW7GvmKqsRx0ktA9DOxUcR94Vnf?= =?utf-8?q?M+rvMp4DvK2HXK9MEvYfx0WiABHp3Khg8VxQqMIgydlQskgMGsusHRKqaGn9xEe0k?= =?utf-8?q?QSrU9M42/6wj62c4zzuD8YufhihQR07IF48V1T8iHPRtKMkYxh04kY+pQJIiTXzdK?= =?utf-8?q?M6nLsL6J5PNRbW4TiygnOqgGKuLJXoiodQKaHpmwh5veASIFTjCHEoWNv/Badj+JT?= =?utf-8?q?wyE0nJ6gbTRQ70dE178fAF5j6WFp6vnYYlCko+MY5vIYdsLzMx8H5JmUYkBdH8I4w?= =?utf-8?q?tVhDVkG+nFkywT?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05bf3ced-636b-49ac-bbae-08d8f55da71e X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB4488.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2021 22:29:46.0504 (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: 9SqUe/OewXQ+RKLsKtylJfj2AiW8dKS7Sgv4JEwA2cSoUAQztbmke7Zib2c9IRDmWi3lMHOjBQAujTzHU8OAgg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3759 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 Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Dave, Daniel, New stuff for 5.13. There are two small patches for ttm and scheduler that were dependencies for amdgpu changes. The following changes since commit 2cbcb78c9ee5520c8d836c7ff57d1b60ebe8e9b7: Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-03-26 15:53:21 +0100) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.13-2021-04-01 for you to fetch changes up to ef95d2a98d642a537190d73c45ae3c308afee890: drm/amdgpu/display: fix warning on 32 bit in dmub (2021-04-01 17:32:32 -0400) ---------------------------------------------------------------- amd-drm-next-5.13-2021-04-01: amdgpu: - Re-enable GPU reset on VanGogh - Enable DPM flags for SMART_SUSPEND and MAY_SKIP_RESUME - Disentangle HG from vga_switcheroo - S0ix fixes - W=1 fixes - Resource iterator fixes - DMCUB updates - UBSAN fixes - More PM API cleanup - Aldebaran updates - Modifier fixes - Enable VCN load balancing with asymmetric engines - Rework BO structs - Aldebaran reset support - Initial LTTPR display work - Display MALL fixes - Fall back to YCbCr420 when YCbCr444 fails - SR-IOV fixes - Misc cleanups and fixes radeon: - Typo fixes ttm: - Handle cached requests (required for Aldebaran) scheduler: - Fix runqueue selection when changing priorities (required to fix VCN load balancing) ---------------------------------------------------------------- Alex Deucher (20): drm/amdgpu/display/dm: add missing parameter documentation drm/amdgpu: Add additional Sienna Cichlid PCI ID drm/amdgpu: add a dev_pm_ops prepare callback (v2) drm/amdgpu: enable DPM_FLAG_MAY_SKIP_RESUME and DPM_FLAG_SMART_SUSPEND flags (v2) drm/amdgpu: disentangle HG systems from vgaswitcheroo drm/amdgpu: rework S3/S4/S0ix state handling drm/amdgpu: don't evict vram on APUs for suspend to ram (v4) drm/amdgpu: clean up non-DC suspend/resume handling drm/amdgpu: move s0ix check into amdgpu_device_ip_suspend_phase2 (v3) drm/amdgpu: re-enable suspend phase 2 for S0ix drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend drm/amdgpu: update comments about s0ix suspend/resume drm/amdgpu: drop S0ix checks around CG/PG in suspend drm/amdgpu: skip kfd suspend/resume for S0ix drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x drm/amdgpu/display: fix memory leak for dimgrey cavefish drm/amdgpu/pm: mark pcie link/speed arrays as const drm/amdgpu/pm: bail on sysfs/debugfs queries during platform suspend drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend drm/amdgpu/display: fix warning on 32 bit in dmub Alex Sierra (2): drm/amdgpu: replace per_device_list by array drm/amdgpu: ih reroute for newer asics than vega20 Alvin Lee (1): drm/amd/display: Change input parameter for set_drr Anson Jacob (2): drm/amd/display: Fix UBSAN: shift-out-of-bounds warning drm/amd/display: Removing unused code from dmub_cmd.h Anthony Koo (2): drm/amd/display: [FW Promotion] Release 0.0.57 drm/amd/display: [FW Promotion] Release 0.0.58 Aric Cyr (2): drm/amd/display: 3.2.128 drm/amd/display: 3.2.129 Arnd Bergmann (3): amdgpu: avoid incorrect %hu format string amdgpu: fix gcc -Wrestrict warning amdgpu: securedisplay: simplify i2c hexdump output Bhaskar Chowdhury (6): drm/amdgpu: Fix a typo drm/amdgpu: Fix a typo drm/atomic: Couple of typo fixes drm/radeon/r600_cs: Few typo fixes drm/amd/amdgpu/gfx_v7_0: Trivial typo fixes drm/amd: Fix a typo in two different sentences Bindu Ramamurthy (1): drm/amd/display: Allow idle optimization based on vblank. Chengming Gui (1): drm/amd/amdgpu: set MP1 state to UNLOAD before reload its FW for vega20/ALDEBARAN Chris Park (1): drm/amd/display: Disable MALL when SMU not present Christian König (5): drm/amdgpu: remove irq_src->data handling drm/amdgpu: add the sched_score to amdgpu_ring_init drm/amdgpu: share scheduler score on VCN3 instances drm/sched: select new rq even if there is only one v3 drm/amdgpu: load balance VCN3 decode as well v8 Daniel Gomez (2): drm/amdgpu/ttm: Fix memory leak userptr pages drm/radeon/ttm: Fix memory leak userptr pages David Galiffi (1): drm/amd/display: Fixed Clock Recovery Sequence Dennis Li (1): drm/amdgpu: add codes to capture invalid hardware access when recovery Diego Viola (1): drm/amd/display: fix typo: liason -> liaison Dmytro Laktyushkin (3): drm/amd/display: hide VGH asic specific structs drm/amd/display: revert max lb lines change drm/amd/display: revert max lb use by default for n10 Eryk Brol (1): drm/amd/display: Fix MST topology debugfs Evan Quan (9): drm/amd/pm: fix Navi1x runtime resume failure V2 drm/amd/pm: make DAL communicate with SMU through unified interfaces drm/amd/pm: label these APIs used internally as static drm/amd/pm: drop redundant and unneeded BACO APIs V2 drm/amd/pm: no need to force MCLK to highest when no display connected drm/amd/pm: unify the interface for loading SMU microcode drm/amd/pm: fix missing static declarations drm/amd/pm: unify the interface for power gating drm/amd/pm: unify the interface for gfx state setting Fangzhi Zuo (1): drm/amd/display: Fix debugfs link_settings entry Feifei Xu (1): drm/amdgpu: skip PP_MP1_STATE_UNLOAD on aldebaran Guchun Chen (6): drm/amd/pm: fix MP1 state setting failure in s3 test drm/amd/pm: fix gpu reset failure by MP1 state setting drm/amd/display: add DMCUB trace irq support for DCN302 drm/amdgpu: fix NULL pointer dereference drm/amdgpu: fix compiler warning(v2) drm/radeon: avoid potential null pointer access Horace Chen (1): drm/amdgpu: move vram recover into sriov full access Huacai Chen (1): drm/amdgpu: Set a suitable dev_info.gart_page_size Jack Zhang (1): drm/amd/amdgpu implement tdr advanced mode Jake Wang (1): drm/amd/display: Use pwrseq instance to determine eDP instance Jimmy Kizito (2): drm/amd/display: Add dynamic link encoder selection. drm/amd/display: Update display endpoint control path. John Clements (2): drm/amdgpu: update host to psp interface drm/amdgpu: added support for dynamic GECC Krunoslav Kovac (1): drm/amd/display: Rename fs_params to hdr_tm_params Lee Jones (3): drm/amd/display/dc/dce80/dce80_resource: Make local functions static drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap drm/amd/display/dc/calcs/dce_calcs: Remove some large variables from the stack Leo (Hanghong) Ma (2): drm/amd/display: Log DMCUB trace buffer events drm/amd/display: Fix static checker warnings on tracebuff_fb Lijo Lazar (14): drm/amdgpu: Enable VCN/JPEG CG on aldebaran drm/amd/pm: Update aldebaran pmfw interface drm/amd/pm: Modify mode2 msg sequence on aldebaran drm/amd/pm: Add function to wait for smu events drm/amd/pm: Add support for reset completion on aldebaran drm/amdgpu: Add reset control to amdgpu_device drm/amdgpu: Add reset control handling to reset workflow drm/amdgpu: Add PSP public function to load a list of FWs drm/amdgpu: Make set PG/CG state functions public drm/amdgpu: Add mode2 reset support for aldebaran drm/amdgpu: Enable recovery on aldebaran drm/amdgpu: Fix build warnings drm/amd/pm: Fix DPM level count on aldebaran drm/amdgpu: Reset error code for 'no handler' case Luben Tuikov (2): drm/amd/display: Use appropriate DRM_DEBUG_... level drm/amdgpu: Fix check for RAS support Mark Yacoub (1): drm/amdgpu: Ensure that the modifier requested is supported by plane. Nikola Cornij (1): drm/amd/display: Fix black screen with scaled modes on some eDP panels Nirmoy Das (9): drm/amdgpu: wrap kiq ring ops with kiq spinlock drm/amd/display: use GFP_ATOMIC in dcn20_resource_construct drm/amdgpu: fix amdgpu_res_first() drm/amdgpu: allow variable BO struct creation drm/amdgpu: introduce struct amdgpu_bo_user drm/amdgpu: use amdgpu_bo_create_user() for when possible drm/amdgpu: use amdgpu_bo_user bo for metadata and tiling flag drm/amdgpu: make BO type check less restrictive drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings() Oak Zeng (1): drm/ttm: ioremap buffer according to TTM mem caching setting Philip Cox (1): drm/amdgpu: Set amdgpu.noretry=1 for Arcturus Pratik Vishwakarma (1): drm/amdgpu: skip CG/PG for gfx during S0ix Prike Liang (1): drm/amdgpu: fix the hibernation suspend with s0ix Qingqing Zhuo (2): drm/amd/display: enable DP DSC Compliance automation drm/amd/display: add log for automated test Qu Huang (2): drm/amdkfd: Fix cat debugfs hang_hws file causes system crash bug drm/amdkfd: dqm fence memory corruption Rodrigo Siqueira (1): drm/amd/display: Add refresh rate trace Rohit Khaire (1): drm/amdgpu: Add new PF2VF flags for VF register access method Roman Li (1): drm/amd/display: Populate socclk entries for dcn2.1 Sefa Eyeoglu (1): drm/amd/display: check fb of primary plane Shirish S (1): drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD Stylon Wang (1): drm/amd/display: Guard ASSR with internal display flag Tian Tao (3): drm/radeon/radeon_pm: Convert sysfs sprintf/snprintf family to sysfs_emit drm/amdgpu: Convert sysfs sprintf/snprintf family to sysfs_emit drm/amd/pm: Convert sysfs sprintf/snprintf family to sysfs_emit Tom St Denis (1): drm/amd/amdgpu: Add CP_IB1_BASE_* to gc_10_3_0 headers Tong Zhang (1): drm/radeon: don't evict if not initialized Victor Lu (2): drm/amd/display: Deallocate IRQ handlers on amdgpu_dm_irq_fini drm/amd/display: Use pr_debug in DM to prevent dmesg flooding Vladimir Stempen (1): drm/amd/display: Fix typo for variable name Wan Jiabing (1): drivers: gpu: Remove duplicate include of amdgpu_hdp.h Wayne Lin (1): drm/amd/display: Add kernel doc to crc_rd_wrk field Wenjing Liu (2): drm/amd/display: define mod_hdcp_display_disable_option struct drm/amd/display: add mod hdcp interface for supporting encryption state query Werner Sembach (1): drm/amd/display: Try YCbCr420 color when YCbCr444 fails Wesley Chalmers (6): drm/amd/display: BIOS LTTPR Caps Interface drm/amd/display: Interface for LTTPR interop drm/amd/display: Enumerate LTTPR modes drm/amd/display: LTTPR config logic drm/amd/display: New path for enabling DPG drm/amd/display: Set max TTU on DPG enable Xiaojian Du (1): Revert "drm/amdgpu: disable gpu reset on Vangogh for now" Xℹ Ruoyao (1): drm/amdgpu: check alignment on CPU page for bo map xinhui pan (1): drm/amdgpu: Use correct size when access vram drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- drivers/gpu/drm/amd/amdgpu/aldebaran.c | 407 +++++++ drivers/gpu/drm/amd/amdgpu/aldebaran.h | 32 + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 35 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 414 ++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 102 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 102 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 - drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 94 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 51 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 23 +- drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 98 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 85 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 32 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 17 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 15 +- drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 26 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 17 +- drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 3 +- drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 25 + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +- drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 143 ++- drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 116 +- drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 7 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 8 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 108 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 203 +++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 19 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 12 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 72 ++ .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 134 +-- .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 40 + drivers/gpu/drm/amd/display/dc/Makefile | 5 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 190 ++++ drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 ++++++++++---------- drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 120 +- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 7 + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 101 +- .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 28 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 46 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 207 +++- .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 303 +++++ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 24 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 6 + drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 16 + drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 9 +- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 16 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 24 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 3 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 32 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +- .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 28 +- .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 28 +- .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 28 +- .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 28 +- .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 28 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +- drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 13 + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 86 ++ .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 29 +- .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 25 +- .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 30 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 41 +- drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 144 ++- drivers/gpu/drm/amd/display/include/logger_types.h | 3 + .../drm/amd/display/modules/color/color_gamma.c | 6 +- .../drm/amd/display/modules/color/color_gamma.h | 4 +- .../drm/amd/display/modules/freesync/freesync.c | 37 +- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 10 +- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 4 +- .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 37 +- .../amd/display/modules/hdcp/hdcp1_transition.c | 6 +- .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- .../amd/display/modules/hdcp/hdcp2_transition.c | 10 +- .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 10 + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 7 +- drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 10 +- .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 6 + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 9 + drivers/gpu/drm/amd/include/atombios.h | 4 +- drivers/gpu/drm/amd/include/atomfirmware.h | 38 +- drivers/gpu/drm/amd/include/kgd_pp_interface.h | 14 + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 198 +++- drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 3 +- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 128 +-- .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 11 +- drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 5 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 13 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 3 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 4 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 406 ++++--- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 18 + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 71 +- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 58 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 30 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 + drivers/gpu/drm/drm_atomic.c | 4 +- drivers/gpu/drm/radeon/r600_cs.c | 6 +- drivers/gpu/drm/radeon/radeon_object.c | 2 + drivers/gpu/drm/radeon/radeon_pm.c | 36 +- drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- drivers/gpu/drm/scheduler/sched_entity.c | 6 +- drivers/gpu/drm/scheduler/sched_main.c | 103 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 14 + include/drm/gpu_scheduler.h | 3 + 197 files changed, 5039 insertions(+), 2273 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.c create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.h create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h