From patchwork Wed Mar 10 22:11:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 12129619 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 8368EC433E6 for ; Wed, 10 Mar 2021 22:12:07 +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 37EE464FAB for ; Wed, 10 Mar 2021 22:12:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37EE464FAB 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 EF01D89D7F; Wed, 10 Mar 2021 22:12:05 +0000 (UTC) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2069.outbound.protection.outlook.com [40.107.94.69]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C3E389D7F; Wed, 10 Mar 2021 22:12:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TSFpq1UB3fXY51xSlhpb3OcP3QTaCtIUrtmTkih3NFcIIFj/QnrckjNNOqxYi8Rki0SlmoKkZiJcYsXvZUPIa6uyw4CPDjLKB59Y6OFDyTahJsSvh8Yurd/K40oR4r147gT6GqABFN/REtSl9mQeEhrx2u+bj9igu8t4Xn2GgGkdgWrU/s+TZ4RrNf0grsWOms1bIKE8LQRotN/owyL0PRLs9OsiDQNgv1hjmsYdKuXkvXE8aU77IQBzDle5CV4Rb4IkmklbrXfcaOZdp5kELHh7rSRAc0//1HISfSyyyUHgLUpT2jArqOVAnaFgQzSot+RkXDBfzH7e9e4TGtYDbw== 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=DgxShGdghfOnUTFIUgW1AdIGZvBh0X/FqW3o5N41NOs=; b=TKjj/CARlIW9DxqZQpWZFeHVxBDvb10TGNuwc8Qv7rQ5i2r4Ud2k1FpRbc5573olPEaVV/vv01REM5kMXJTFMre/oncb5sfSRCrhcAb64ue9H3Rqmgv9j73RcPcYqHDf0xmJDhVBzAPv4tD2xiuJ954RJqWXYVlIY5S+5C2xlyFJ32cMB+3nR//Fmx4oXk3ucbdOpBXt+SuoazUemARfNyuUQoVKM6vG6zgZnQ5y4/Q0SuO/q1pSHBcGzyNq1OGdzBTrwUCKjl8ZeR5NYp6mSA+LxUZkBBYn6ufRsBRxmM9GiLtht3m+OCDQdgh8b3FaLKNGNyt8syuWrfnswtEc9w== 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=DgxShGdghfOnUTFIUgW1AdIGZvBh0X/FqW3o5N41NOs=; b=hyR/D4BOgPa13W10DxgmCWYDBKVlZFiSaDc+VmbbF4trZy/0CMdUc8auhyXw2hmjWkv8zAxk6sFGlYEbrl4UGcxCQgyxd/u03qQISKpSFX+eSRkhIXDumH03ZXElKdSS8H5pMpZTY4Fih/Al3CuCm4lsmBE3XL6rhVUSmTFQSZc= 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 MN2PR12MB3872.namprd12.prod.outlook.com (2603:10b6:208:168::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Wed, 10 Mar 2021 22:12:02 +0000 Received: from MN2PR12MB4488.namprd12.prod.outlook.com ([fe80::5deb:dba7:1bd4:f39c]) by MN2PR12MB4488.namprd12.prod.outlook.com ([fe80::5deb:dba7:1bd4:f39c%4]) with mapi id 15.20.3912.030; Wed, 10 Mar 2021 22:12:02 +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 drm-fixes-5.12 Date: Wed, 10 Mar 2021 17:11:41 -0500 Message-Id: <20210310221141.3974-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.29.2 X-Originating-IP: [192.161.79.247] X-ClientProxiedBy: BL1PR13CA0170.namprd13.prod.outlook.com (2603:10b6:208:2bd::25) 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 BL1PR13CA0170.namprd13.prod.outlook.com (2603:10b6:208:2bd::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.23 via Frontend Transport; Wed, 10 Mar 2021 22:12:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 15a09086-98ab-498b-15f0-08d8e41187b3 X-MS-TrafficTypeDiagnostic: MN2PR12MB3872: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:873; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8LncXfCPV5x8iJCV4OGBV7Cn9WvMVxG+E2V7JLf1Ky6LTHTxn3eIQPZHWqbtXXrvP95wbwoP8i23tAheHLDuUPCrrIkIxQRb2s/jJfJx4Dm2+9BMoJNPvJsrhKPjRGoo7Ns/HS7w7TEXmKgDX+57/lM3Advamh5+7P9BQ7fs7sVotkyq3ZodQVxwsACtkK8a+yqKk0nv2evb2IAiQW5+HfVcDI7QzOSB9F4PJzGwiuhqvVs23pNtYAZfu+7xFA3sBnRdSfkQ7jm6Ur3xQXsPbYBeBM++Y02VqUXAfX91RODSALpOejKGHEK0EE7uYtHnbErn+UZ3TIEsNKSo4rB4Dkr2W7gAd1t86TA2opx7zrkr6ZFNx3ZjXla3I+S6I56O/mN+KEw8wfmhvNBGYRKD7M1s/TV4cYIUzw53MqFBtTWXAdXghZBJShHUWfjgdxK5I2RU7jlSmJMNCwky8zntB2krBpFTh3hQmqcargdBCrFPdeun+iRYMibGorq/XWm3PlyBAsOWM3ro60TpG5KN78GwRtxKqUQ7qjCp4/LoNKUvVfS/0N0lF3XbxIuuO0Wn 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)(346002)(366004)(376002)(39860400002)(396003)(136003)(6506007)(478600001)(5660300002)(4326008)(8676002)(16526019)(956004)(66556008)(6486002)(66946007)(6512007)(2906002)(2616005)(186003)(36756003)(1076003)(26005)(66574015)(86362001)(52116002)(6666004)(66476007)(83380400001)(966005)(316002)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?ZCjvq09hOY1FTDXxl1+vsQjKM57riO?= =?utf-8?q?DdwwA4+gR0DYWEhM1bXqBXS+1OiCLPNbFFytPaxInG0gxopvfJLJgVPt4dHKjWdMj?= =?utf-8?q?Fw3GXrTBkRX4+h6q7TaZMz+PC/9rziJ7Y61PJNAvktyM9KOvgKmFpQRhDodKMDiB0?= =?utf-8?q?ULYZ4uCH+/HIjtdWF5f0sX/ZzYefj4lBJO8mzVyVLEdKCQDUltE8cIz99SuR2Kel2?= =?utf-8?q?cUW3LpybXuqfBK3FR4mrl2+pZ1tH7tiwvrJ/oY+phehRUV3XiTgeXVjoFkqKaPGNU?= =?utf-8?q?8m1dmXEL37k4Tj6oUFr6Bq7KbqjZEEDkAC4JzyXYoB5ZSrjnV6MxAs2AGpw9jPyBY?= =?utf-8?q?zKw4cJmWXbUZnhphrQ/sGcQb5+QWAOQXtYoyhUaG9yK5uhxhZ2xeI+Z6/wU4AfzVh?= =?utf-8?q?pXDtF6heeeZAd9mrvwHr6HfOAcrfb0gUfVTttUqxFsVHLJhuBhAqY9IbE1U8g4lfX?= =?utf-8?q?w0Qk7M/0I2aCmAkcXf9UmwdoVGxkFIrcpI/RiXm2KiNO9lZ5jObn71UEH+4JOAhyN?= =?utf-8?q?7f42zWX8E3mUX2UDt9sSqPfyxudFHVZVd7LS61ed84d7pYD88hRhhcIH2YNfzWas4?= =?utf-8?q?e5H8Ds924Hsd2c4PeL1lRd7S1FiTbSKK9Lkm1waLjm1yzPd0jnhJQVyQCGoUaMT34?= =?utf-8?q?Rw5emq3Pp//NuSLQZn1QeAoG7zglq5ZgbVXQy34UJsjsou14CRbd074YGMZZEqvW+?= =?utf-8?q?Uw+cFNMrAyYLSqU90xayTqd5tT/r1Q24pCVFsSvLhJOoio7iiNE/PkPgyEiY1HrVt?= =?utf-8?q?kMbgXaNegQ6emZFW0c+dIPDx/mvFdszX6p/hXTaf5zJ27+7yA/9IuiUH5Cp5zyqDv?= =?utf-8?q?Ld5IV8bvF3SxIwmVuycAoJN9O7EZWLix8FwIiYH9VSUTg4UzePY9Q5bg22ubeIm2V?= =?utf-8?q?4mbm3w1/PIYR8SdWdbY73iFzKVpUEhXSY+upRT4LEdDlaWHhHhMcNxafJglTI9LeE?= =?utf-8?q?D0xKmM7ng5MkhEZs2gu54xcdM2VydOitZmBbE+cnpIRtq78t0gwlbNYNnST+f22u4?= =?utf-8?q?PP/+GbNR3YU9/z6+CQ0qOIF3S3TgUhGI+bSYh7+8C3hMpZQ8/VhWuKK4fbkIC5or9?= =?utf-8?q?ttxpgZqXiDlpdwA2xlc/WsIfj0yGFNIq32+XXJXbLfEGNFk6TpLyVEweDgAl19h9v?= =?utf-8?q?0GkpGVUKgJ9jhUjNezMHNoLeEhMaA7dp6m4cFk6j1/hyfSKYRJ2dXoD5DjXGQb08k?= =?utf-8?q?EG7dD8tz5diZVB9y4F+Z026wengv3braxtww913jAThFzebh/fgAf1g8QkgkcW2oR?= =?utf-8?q?7jHwsi34xRABJa?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15a09086-98ab-498b-15f0-08d8e41187b3 X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB4488.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2021 22:12:01.9314 (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: ZginfifMwul4OSGnWfwUby16dWrOTR9d+/OJJcCBetN3UrnBBm5t7jfPfPPwdHkfl40lDOvSd/2VzwMKNWSt+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3872 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 1aa46901ee51c1c5779b3b239ea0374a50c6d9ff: drm/amdgpu: fix parameter error of RREG32_PCIE() in amdgpu_regs_pcie (2021-03-03 23:05:16 -0500) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-5.12-2021-03-10 for you to fetch changes up to a5cb3c1a36376c25cd25fd3e99918dc48ac420bb: drm/amdgpu: fix S0ix handling when the CONFIG_AMD_PMC=m (2021-03-10 16:23:26 -0500) ---------------------------------------------------------------- amd-drm-fixes-5.12-2021-03-10: amdgpu: - Fix aux backlight control - Add a backlight override parameter - Various display fixes - PCIe DPM fix for vega - Polaris watermark fixes - Additional S0ix fix radeon: - Fix GEM regression - Fix AGP dependency handling ---------------------------------------------------------------- Alex Deucher (4): drm/amdgpu/display: simplify backlight setting drm/amdgpu/display: don't assert in set backlight function drm/amdgpu/display: handle aux backlight in backlight_get_brightness drm/amdgpu: fix S0ix handling when the CONFIG_AMD_PMC=m Christian König (2): drm/radeon: also init GEM funcs in radeon_gem_prime_import_sg_table drm/radeon: fix AGP dependency Dillon Varone (1): drm/amd/display: Enabled pipe harvesting in dcn30 Evan Quan (1): drm/amd/pm: correct the watermark settings for Polaris Holger Hoffstätte (2): drm/amd/display: Fix nested FPU context in dcn21_validate_bandwidth() drm/amdgpu/display: use GFP_ATOMIC in dcn21_validate_bandwidth_fp() Kenneth Feng (1): drm/amd/pm: bug fix for pcie dpm Nirmoy Das (1): drm/amdgpu: fb BO should be ttm_bo_type_device Qingqing Zhuo (1): drm/amd/display: Enable pflip interrupt upon pipe enable Sung Lee (1): drm/amd/display: Revert dram_clock_change_latency for DCN2.1 Takashi Iwai (1): drm/amd/display: Add a backlight module option Zhan Liu (1): drm/amdgpu/display: Use wm_table.entries for dcn301 calculate_wm drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 50 ++++++----- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 1 - drivers/gpu/drm/amd/display/dc/dc.h | 1 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 11 +++ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 6 ++ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 7 ++ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 1 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 6 ++ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 1 + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 8 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 1 + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 31 +++++++ .../drm/amd/display/dc/dcn301/dcn301_resource.c | 96 +++++++++++++++++++++- drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 8 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 48 +++++++++++ .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 66 +++++++++++++++ .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 48 ++++++----- drivers/gpu/drm/radeon/radeon.h | 2 + drivers/gpu/drm/radeon/radeon_gem.c | 4 +- drivers/gpu/drm/radeon/radeon_prime.c | 2 + 26 files changed, 353 insertions(+), 57 deletions(-)