From patchwork Thu Apr 1 02:00:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 12176837 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 3D6DAC433B4 for ; Thu, 1 Apr 2021 02:01:19 +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 F1B7E61004 for ; Thu, 1 Apr 2021 02:01:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F1B7E61004 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 940866EC06; Thu, 1 Apr 2021 02:01:16 +0000 (UTC) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08on2080.outbound.protection.outlook.com [40.107.101.80]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9AE776EC04; Thu, 1 Apr 2021 02:01:14 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B2Ki4wkcuHmapI/JxCsBINdKrS7qslEVWrMVPnJHnFvWZThF/sHS6NvOewKezd8GqtODPMFT/l7lyt50qkS6ZXNxzKVNG7Ib2Y7LomyJwVQVW3dSC6NLm5SrkYwS+P9ITsErULDDyGeVLdYCiyJWLzTGAtGxMSRUbDj6RdvA9fYVkBEI0jthXNRC1Psl5GsU5jWfXKC9rYZn17NI7RAxkNnJds07rJpq7Hcll8u4ckFUIpY8oi7hQRiZXijd5TRgugqdyuxBCOa5jP/GTH0CL4wfMZMnDgSqJg1ZC+h4ciorb0nen61Ew44DX3XpSDoEFuRz1pz4YOyXbT43g95DaA== 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=r/cKxHCiGqJ8LskjF2+IreNvsj4v5krsCJEw1zVKsmE=; b=CCZW4pZwCKyTwv6umrf7vkh2j3jVX5fzfJzSTAWM5zVfwS8YwdnDUCseYL9MyT/UKsSv7oCJhrDU6z2y3GqSzjquEhBohC1UMoxtacRGTLBbSp7CPX9+E4cOHuP2CioGAbIugGzous89PC7uei2Gjt7xN+oJZ0cACjTjyjByTja9jUziaRavKs9BsPe7pzjK0eUXmAOhkbAquNzA7maGpIs0zQ///Z8mplKNScvvxPL/XR01kWxtoTND8UFe+07/FemLLRGakufGVA0Jbw13GPVlkVEloXwPxKzGvVGV+4eU/L1A9OsJa3bkMbN9uf4CxRb410iMyTNtTmd2onKQZw== 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=r/cKxHCiGqJ8LskjF2+IreNvsj4v5krsCJEw1zVKsmE=; b=lCT1O4pz+n9IYHT1PH24OGgxHklVQH9YEOHEHkY3BYbgXe6GzcDmCkYAyz/TMTW3hsUZqgD+TBUEpeo5P+nux94BMagnf6yiXHjs/O6Xl6WHsRS5h4qUjO7CfIDPkLuZnCbpehP2qoY4Fczio7tfeMQSkmZYKqqA+F7xynfWRUk= 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 BL0PR12MB2338.namprd12.prod.outlook.com (2603:10b6:207:4c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.27; Thu, 1 Apr 2021 02:01:12 +0000 Received: from MN2PR12MB4488.namprd12.prod.outlook.com ([fe80::3d98:cefb:476c:c36e]) by MN2PR12MB4488.namprd12.prod.outlook.com ([fe80::3d98:cefb:476c:c36e%7]) with mapi id 15.20.3977.033; Thu, 1 Apr 2021 02:01:12 +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, amdkfd drm-fixes-5.12 Date: Wed, 31 Mar 2021 22:00:57 -0400 Message-Id: <20210401020057.17831-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.30.2 X-Originating-IP: [192.161.79.247] X-ClientProxiedBy: MN2PR20CA0016.namprd20.prod.outlook.com (2603:10b6:208:e8::29) 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 MN2PR20CA0016.namprd20.prod.outlook.com (2603:10b6:208:e8::29) 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 02:01:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b553fa2c-6079-4f5b-5bd6-08d8f4b206a0 X-MS-TrafficTypeDiagnostic: BL0PR12MB2338: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:462; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tJlvxiN/+yh4gJlK5mDHjXj5yF1zt9zpbcgOYEw8s4vFBk93qz92VHosD4tr686hhNqSjA+fDcDCdsXpUB7jjelg2yIZ955eOkwtoy3PVs9+PADXJK/65TtWzYUbr0A3Q/EuaP0Z4S7VhqEhxuVJlowwav3EKVFLGzWbKu5OyUbm0sHNWQ9coZ+iU1SQu3zCshlJsI4muWmd39maGNEljdMhGYB7Q83OUhgs0zF8FxWD5RlokJuJAvtBK4dX4R+38dWktNxRBdvVBZAvLO+k8asiImVGnwXiA+eibdEmiAy4qGHW+ErE4yldcBpTASjCByakmlfqPjXQnYmiLWsuJJR/Hatp6fl7AGg0VeadGKPhgO2LzbEu+MHG04PWK7IQhPvB21BqIYyl3p4IN63aDStvaCFIQFKlwGZS0lBOYdjlA8dO6BjhafJa2pPjeAscMqTskTshNDySb2xQV4gX/kFtnKp60bN3ykcJDC7xuUPhifpDIYXPg/RdITybicqkNR4GUKM4YrviIvFE9LhJMkGqM5/k0CiXcaiD16mXcmIxyj7kal2EZLkUubwZ6dEXjngH6WLHLN+DwnBtZkIPc4uZUSOwur7ka00zeNy8iLUiKpzzT//jyoxqUqWivNFy5Y0dNx5ADsu9hTzHYOfFl+PA6fYZtae9LrsD6mrIUlo+AovKdQaTcVqnSRkRTuuN 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)(366004)(52116002)(5660300002)(6512007)(8936002)(83380400001)(86362001)(16526019)(186003)(4326008)(66556008)(66476007)(26005)(1076003)(38100700001)(36756003)(498600001)(966005)(956004)(66946007)(2616005)(6666004)(2906002)(6506007)(6486002)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?2Qb43CTHhjsNWfOxitLy3n0uqfZLLr?= =?utf-8?q?LrUxjmbtcwxHzYz9xuBcETB0APmFPc5VwCx61prCyHwuXqrtt+fxuoHM5/vG8OdE+?= =?utf-8?q?+k8ZrvGp5xOgNxT4UDyuF7eAex/g/LXdFrFGyJHtPRUShLK6vwIAGVGsuMT0OdAMc?= =?utf-8?q?tqN0AOE3sFDcv7E0liUusYFlhO1B3KtT4WS3PeViHOuNHyyFkxmf1ihgcJ4/LKgHq?= =?utf-8?q?uT6PXzCwEqVWfJxoBBhqE/MbtyjHAnWPnpvy1GzF7D9jcUiicDINTmMexXpAElmER?= =?utf-8?q?ca5AYdJ7SDENxEsYsTK+eMXZT0KS5bvUILzieE3JvZqsOM8BbxVIyNbfcL92zv8AT?= =?utf-8?q?Ddv1sXrWBLPzKtABC4f/nZo8bkFzT+d0AT9XHOWELimaxZGf9sb4vBtA9UA+weRsv?= =?utf-8?q?a9iiF1vrTRKmUGbsdtnPcAWsgyTCojm8gLPpIZchbKJ8bbW28vhk0Yph3aZXQYxoS?= =?utf-8?q?0tNdcBbLjlTRFqrh8HmEkXIDIrVH/3r8Rd3j+7M+h2u87dzrmTsp9MvOAXHB34JRS?= =?utf-8?q?MiGLrTLSMuL8e+plAvXGxIoIHrYai96X6uLMR3S6TsIMhV/ED+34wfgpDIe66Fwz+?= =?utf-8?q?IRfNthL6WOZVffgUEQk/Yf2TKkGnu53FJPGjIq52+aHi4PEiz7TXL3KF/WQGbz+/9?= =?utf-8?q?eg/ldTLmNo+d6Rt74+hh8W+aCaeG/rxuCrhUopFQ0T2e1WgbyM6g/FcJ3HgKx7C8g?= =?utf-8?q?y/kTc0GDmjsrlJg37VjkcGUdafX23lLzqNL4ekSnMU1FUlfXQdndfX5gcHWq1Sia7?= =?utf-8?q?zAg+48yvWLYs99WYuNktUfXf6qU+WD0p6WE1vpISd5l/w5YhAjzQRHgP6eH5k6tiV?= =?utf-8?q?eVgTBrtg7lW4kP1eyj+LgsX9gGoFj9ZKzToEzIY/wqb+m16Yq21SS7p4X5gXQRQTj?= =?utf-8?q?5LhXRelj+q1IfwBHLxknZe2+HUJrc5C04BHlWR7qSLEeRA95SekXDw5l3vXXqWumr?= =?utf-8?q?OVTJebwO9kznKsTBvH6uISjsWE12c9eI8WZxSeBa4TckQFaSOBS9I68PoFwxqwQWG?= =?utf-8?q?4m7dWMy4RiceyN3IE/6HX973D/slDCmAd/8CD64G6Pn+UMXpn+fMk+kWk9AhYpepG?= =?utf-8?q?VlmKTw6EWJ5/QqsJPWhSWlDLOPLGg5nQiIOe1Ip6fnvVgg6E8H9RYdna5e7G5hvds?= =?utf-8?q?1Ez5mO5JySScByQG5HnuZQUoaDVLYIr6BLT6C/QKVb3A+gM/L1A4d7fy8iIS0F9jw?= =?utf-8?q?ifsrwKB76oeMubspPYImBkmfjdadh1OGlCj88aCBA4kY8rX40JXLjGG90B7Dooxmx?= =?utf-8?q?qdVJlvYauQevwr?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: b553fa2c-6079-4f5b-5bd6-08d8f4b206a0 X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB4488.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2021 02:01:12.7494 (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: XgJOpK4tZ3eU/prN+0b5VapJoO+pHgmQmYnP41UMR36Nc4DwYvVuTAUpV46MwszofWoRD1cTnpRw97eClQjiwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB2338 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, Fixes for 5.12. The following changes since commit 09d78dde88ef95a27b54a6e450ee700ccabdf39d: Merge tag 'drm-msm-fixes-2021-02-25' of https://gitlab.freedesktop.org/drm/msm into drm-fixes (2021-03-26 13:04:17 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-5.12-2021-03-31 for you to fetch changes up to e3512fb67093fabdf27af303066627b921ee9bd8: drm/amdgpu: check alignment on CPU page for bo map (2021-03-31 21:53:38 -0400) ---------------------------------------------------------------- amd-drm-fixes-5.12-2021-03-31: amdgpu: - Polaris idle power fix - VM fix - Vangogh S3 fix - Fixes for non-4K page sizes amdkfd: - dqm fence memory corruption fix ---------------------------------------------------------------- Alex Deucher (1): drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend Evan Quan (1): drm/amd/pm: no need to force MCLK to highest when no display connected Huacai Chen (1): drm/amdgpu: Set a suitable dev_info.gart_page_size Nirmoy Das (1): drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings() Qu Huang (1): drm/amdkfd: dqm fence memory corruption Xℹ Ruoyao (1): drm/amdgpu: check alignment on CPU page for bo map drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 10 +++++----- drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +++--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- 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 | 8 ++++---- drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 3 ++- drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 +++++ 11 files changed, 26 insertions(+), 20 deletions(-)