From patchwork Thu Aug 26 03:26:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 12458935 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=-23.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 5D689C432BE for ; Thu, 26 Aug 2021 03:27:22 +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 1A10E610A7 for ; Thu, 26 Aug 2021 03:27:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1A10E610A7 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A02F6E4B5; Thu, 26 Aug 2021 03:27:19 +0000 (UTC) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2071.outbound.protection.outlook.com [40.107.236.71]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B94D6E4B1; Thu, 26 Aug 2021 03:27:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R4HB0X0BC9FISt2JJl59sOqx1TV4OCI49vfNN7ekR930NxVzhk1rUeVGeQv1WL/VoqeTZMC5acLZYqKqVxur8mM2vYPFH2f2nO3TKTIAf5eRqDkS/VwtHPYfP8fhxB4KvlTpkui0/meb3cPwDXhpAdtGHHK5zOMvTxDD3mA8cLLwpJuu7O6VkEWlGt4uYrXjROr4aTiJxQtRWBr52G15J9d38KLiYerpNNDXdWXxw+la5dmXrVt6u8Ov6QHD3RsKLlLhhG/mOVyShq553CFg056dgappyTMwnNHq2lWKN+z1bs4Y+sAcNgXHxxkHKQBSTRhdY7bv2RpT3rP9ShcQPg== 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=GSiw24eFnh8oPV5CBbsIRY1aaUAic+EuBBthRoIDh3o=; b=Zof3hhVaHb8R8F9wpLTM8plvoUorVtrORlLpQHsScw66otLUsOGoPiNamUO1UmpbuWhG42GO41j6LzIJvVBdSasb1zyFY0q98WQadbjGyy7sGXkrvROfgetESS4frCYYsNaMt4CQ1k3U3bUt/RvbX5RUgtgJk5f1RuR+7fRgEBm0HCRcOJbapSkObTMU3D10z5trStRfT+HMeNwE2Nwbv2KGmc9ms5zY3eBUwhPTYLX+dMDyomS6cUSEPCkyBzXRC0nGHV8tf1GlvG4vYoiqIRSLVZ+QvYzdRISWVRX0UbgTGqhLCApM4d+YMI1j9xuhrXziMfQinEzFHDIcZJqLDQ== 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=GSiw24eFnh8oPV5CBbsIRY1aaUAic+EuBBthRoIDh3o=; b=pj3LF34+dko5vqwWE1VgLy7Vt03YbuQq6XxWyyMraDyc82qEOeg1WfJvGOCSRmncUcAaOATrvhUDnECF8310xpTJqoiHwaRuwwCEbyktAKRDzQaKiVmITYGj2L1bqelaRS8MuXqAHz1f4oO1FXvY+ySDiC6YYBDUe8nnv7Pp3+w= 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 BL1PR12MB5144.namprd12.prod.outlook.com (2603:10b6:208:316::6) by BL1PR12MB5288.namprd12.prod.outlook.com (2603:10b6:208:314::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Thu, 26 Aug 2021 03:27:14 +0000 Received: from BL1PR12MB5144.namprd12.prod.outlook.com ([fe80::5dfc:ea54:4a18:89f5]) by BL1PR12MB5144.namprd12.prod.outlook.com ([fe80::5dfc:ea54:4a18:89f5%4]) with mapi id 15.20.4436.024; Thu, 26 Aug 2021 03:27:14 +0000 From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, airlied@gmail.com, daniel.vetter@ffwll.ch Cc: Alex Deucher Subject: [pull] amdgpu drm-fixes-5.14 Date: Wed, 25 Aug 2021 23:26:58 -0400 Message-Id: <20210826032658.4068-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.31.1 X-ClientProxiedBy: BL1PR13CA0219.namprd13.prod.outlook.com (2603:10b6:208:2bf::14) To BL1PR12MB5144.namprd12.prod.outlook.com (2603:10b6:208:316::6) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (192.161.79.191) by BL1PR13CA0219.namprd13.prod.outlook.com (2603:10b6:208:2bf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.9 via Frontend Transport; Thu, 26 Aug 2021 03:27:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6b9af931-841b-47a4-9dc0-08d9684165bf X-MS-TrafficTypeDiagnostic: BL1PR12MB5288: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:660; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yH4uOVMjxXe+52tTQVx9PR6XWJOpBJ9Xfqy10M0SicqIImJ2cPlBnnAybhzf/2UuX7GhJ1r7CKdrF+XlJ/Jo1NpthHBlmz2Cl79xGEjan0SPpmo8YXwJyVaJnzRsFvJyRcvF1jG6jaYJPsqPI8YF5YgIlBRp04Aimav1IUxbMy0uTpsllol1X4qQ0ebszzSTetfyNZ459Csuh8Mfk7LLJWxexU1YYGIvRTENWHTiodlvdXHh9FMX2kOtK7r6unDh1ATr8SijaPhaimyKTLy+ClaSU1J6T3bL5dfOdLO4KLIo/3k8M++RbrKiBqZYugWTurd/9kr7Ae8m+9zUdQEWH1TX+v9FT1oy0s8IU0z7B4efBP0rp7UDuwbeNGRgALpvqXisQj66v6Q5TnLMifcMU5ohLjPcIjE6f4ATSscpN0tXaQKE/C2JFSZNIQZKQ/MncTaBEDTNYi4DZ5PImNpNPdIaBaMG9mwVvd/V7S9TzGRUr4IbV/AoiKupOm+z2/eY7B07Z9AWz3Y8nAfNf6XVVlw8orbuaQGo9fhqJSsiNL5lDJa0NDT7Yj8X3kRxDXFSWc4OuXu1qgJHi/Q3eeilwi3wqVbS9ZFTb0aJZdwlwBGDQ+MgGcDavdP/ef0i5lUHG+XrOThs89qV1p2P89VHJS+M66eGNMkTVbnXCqIKddmsZ5KScUa/XWz0QWvaMSb5zR1DLwV/GRoc0k1pitjB4g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL1PR12MB5144.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(136003)(366004)(346002)(396003)(39860400002)(38100700002)(66556008)(66946007)(38350700002)(478600001)(66476007)(956004)(4326008)(5660300002)(2616005)(86362001)(966005)(6486002)(186003)(52116002)(1076003)(36756003)(66574015)(6666004)(2906002)(26005)(83380400001)(316002)(6512007)(8936002)(8676002)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?7ZPNo7L9NnkpKbg3Bed9pVYPoO/8?= =?utf-8?q?bhjXulJW0ZjDZr2yVtATkvQMJOgLlc2NkmACD3Lq4cUnEOoXF2xpWZEqwV8FNnKXW?= =?utf-8?q?IeG968nB7HJeMzGdA0mgaadZVXkMUn6Yuqo5ke3eoBkK6j+nEeFvCE3DeLsQ9Vka1?= =?utf-8?q?jZZjSl6tyvFnRHN6P39aDx6oqKgvdMf2o6LNpKD12fPB31koFyRFsYJPAtzN/6GLp?= =?utf-8?q?S2ZjuZb/+6sFofaEwW2fXviH3Ie/3//S8lYWkcX8ZaySqbTE/py111xXtD+57Hf74?= =?utf-8?q?EL+kruNA7N0JqLTpewUILezZ69baAUWz8UEvr6tv5VPzxAUtEiefoKLCvq3FCEKlK?= =?utf-8?q?MNOGM/v2XZC6bMtuXl6ioX3WeW7C1OCBC9lzOqQ+wYeC8R7hwrsX3gynzjGpvztuO?= =?utf-8?q?vO7LGG1vZlogpSWDLP8+3AfjIVUD1oCGip2XVb0onwgHZVMVO/os/+WxdUplCUSx3?= =?utf-8?q?AjM+Lqgk/makNq6KVH871NtdjLHHbMiQUMWHsz4YvPWuz9UtrZfOQWv1Iax/Kp28s?= =?utf-8?q?e6tviTmDzhgieEOEHXcHBmPngwc9R3aVkzxsfMH29Q+UZk0IztHyeUs/BK+BpmsrY?= =?utf-8?q?Z0DQPfvDIrWNix/u8WUhSe/FPo7//CyX8S5Iej2uzJQ19u26GG7KAyK3i4VTGq67D?= =?utf-8?q?dcnK0mhehlK94WWifzMVtCEIf9siUTZa/oZ/nlZlTHxSAvzBE3oOPBHyP+R6/9BuO?= =?utf-8?q?sQVVR1jkQz0WeGZFiapvJh9XqNpZBILU5d+3Pd0sifv5mN56/reHENQC6d6BNqhbn?= =?utf-8?q?UO5MID5JVPGr0wuZv3OwKxC9siK72J5vp/llOj3bBJfDPXq0MJxKaDb8XfMUpuVwg?= =?utf-8?q?OoOrk1uD74crnRVJpHbLblwYRsMEWymaFbU4i2poNkCeg+HSNNyoYzddG+Ij9q4E9?= =?utf-8?q?uT19M5dr3qnAA3FOBK53BZ3UXhIvxBE+1etQ2Gq22v1SKs8YXCwNwUxa001lLa7qZ?= =?utf-8?q?DlVz/5jxuGAWBvwTABB85fou3qT+B0Fr0EKTXdqoCDR7alJVpv0KlK5fADyKKyzVz?= =?utf-8?q?kl6ys6+Vk5sQktawQPyofnhG6Cjt5AgYXJ1KZo/Nr06C2Oh2dcBbxC5Lq33Duvpca?= =?utf-8?q?swpx7H3277Qe3lwVMMxfeLVpMAgAnCUdBR06zFFlsTHkQwwb9DZq3Wy1pdKCocATk?= =?utf-8?q?Q4H7zSAnXW2y8U+qkLIm+SmJewHnHLFlGQ7hoRZk0JyX7XwcOo3QDYFb8mEHVrFtF?= =?utf-8?q?aLYAsCx6/NOlkZb93ogeajH7MFTyTu1USLZ4pcYZB1A4rQ9Pi9bLxYJz19OLq1gIS?= =?utf-8?q?hm8ckF7dqd3FjKWC?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b9af931-841b-47a4-9dc0-08d9684165bf X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5144.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2021 03:27:14.0667 (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: 57574OFrWoub2patJ6nWaE2mTRULu7+GOQk2XkvRv4vFjqZ509tWEnY4dlmQkygfiPWq7zm1wyW8Ano5Fygaqw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5288 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Dave, Daniel, A few last fixes for 5.14. The following changes since commit daa7772d477ec658dc1fd9127549a7996d8e0c2b: Merge tag 'amd-drm-fixes-5.14-2021-08-18' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-08-20 15:13:56 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-5.14-2021-08-25 for you to fetch changes up to c41a4e877a185241d8e83501453326fb98f67354: drm/amdgpu: Fix build with missing pm_suspend_target_state module export (2021-08-24 11:57:44 -0400) ---------------------------------------------------------------- amd-drm-fixes-5.14-2021-08-25: amdgpu: - Fix for pinning display buffers multiple times - Fix delayed work handling for GFXOFF - Fix build when CONFIG_SUSPEND is not set ---------------------------------------------------------------- Borislav Petkov (1): drm/amdgpu: Fix build with missing pm_suspend_target_state module export Christian König (1): drm/amdgpu: use the preferred pin domain after the check Michel Dänzer (1): drm/amdgpu: Cancel delayed work when GFXOFF is disabled drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 11 +++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 36 +++++++++++++++++++++--------- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 10 ++++----- 4 files changed, 36 insertions(+), 23 deletions(-)