From patchwork Tue Nov 27 16:18:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Francis, David" X-Patchwork-Id: 10700765 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 21FCA14E2 for ; Tue, 27 Nov 2018 16:18:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F3822BFCA for ; Tue, 27 Nov 2018 16:18:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3E7E2BD42; Tue, 27 Nov 2018 16:18:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8F2CD2BF40 for ; Tue, 27 Nov 2018 16:18:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 44CDD8982D; Tue, 27 Nov 2018 16:18:23 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-eopbgr800052.outbound.protection.outlook.com [40.107.80.52]) by gabe.freedesktop.org (Postfix) with ESMTPS id 400B16E32A; Tue, 27 Nov 2018 16:18:22 +0000 (UTC) Received: from BN4PR12CA0016.namprd12.prod.outlook.com (2603:10b6:403:2::26) by DM3PR12MB0747.namprd12.prod.outlook.com (2a01:111:e400:5984::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1361.19; Tue, 27 Nov 2018 16:18:18 +0000 Received: from CO1NAM03FT025.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::202) by BN4PR12CA0016.outlook.office365.com (2603:10b6:403:2::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1361.15 via Frontend Transport; Tue, 27 Nov 2018 16:18:18 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by CO1NAM03FT025.mail.protection.outlook.com (10.152.80.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.10 via Frontend Transport; Tue, 27 Nov 2018 16:18:18 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 27 Nov 2018 10:18:16 -0600 From: David Francis To: , Subject: [PATCH] drm/amd/display: Fix compile error with ACPI disabled Date: Tue, 27 Nov 2018 11:18:14 -0500 Message-ID: <20181127161814.14749-1-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(136003)(346002)(396003)(376002)(39860400002)(2980300002)(428003)(189003)(199004)(51416003)(47776003)(49486002)(6306002)(5660300001)(48376002)(68736007)(486006)(81156014)(81166006)(104016004)(50466002)(356004)(53936002)(110136005)(86362001)(8676002)(305945005)(126002)(186003)(8936002)(476003)(50226002)(336012)(97736004)(316002)(14444005)(2906002)(106466001)(4326008)(105586002)(1076002)(426003)(77096007)(2616005)(1857600001)(26005)(450100002)(16586007)(72206003)(36756003)(478600001)(966005); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR12MB0747; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT025; 1:ykh6dgU/LD9ez0+zkh0Qg8v/eVks6N9gLWaYDwGutrActXy6OPqwVIFUvCd/oE0P01eqUAIJryOPioFvWoHxIr1N70cGQ3EldWBYUCkJC/ecxqkzETr08coVnx7LshxK X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa660de1-fd56-4ca3-469e-08d65483f12b X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:DM3PR12MB0747; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0747; 3:JnNOvMkYRqx4mb0oGTbcpPDMBsVMZrvhEmANvPQBZ54bzvDR1cC6HdwTOpRoooDUAHAE9nGyFH32DHrkELNXGP8gzgH3Qvt1F9LZt+AJOf/Nw2leW6jfWusOyGQgiv/x0I5nvF3iIbPAKf+rLJcyAMTiP+swVSQRw1npQAdgc6oW4C9aoHWsrmgFV4NPbIVcYiOsGLz0+Hve6oTbw9uU7/H+JCZdHlgkldcmUvotAaG9+Rb9Z/tt0Rz/SXiD8gXeFtCD/1Q0yz8cwNhCMJ7bpTfHM+7Z+F8nHuPv4/s5YaTa3Kl8eY5lY1fgKvHmotGBfHJdUG+dNhdQI2K+oPKum4/MDSp+Xdad+ueaXGAITa4=; 25:5wRahiaztjxNFpcjDNqrfuophBtlaELhRcUM7HIDteAQO72K/cR9yV8ouL+8yaR8yox4hq5SnbItrnrLZ5nE1MRWCfAwnEtAc8103U0wyPvg9PciI9cF+vn2XfEpTORNMCDG2TN6hRalWJEubD0Oi6aPH5gnWF4BV+BCxiS6LpkZT3ktulAodMoRGfaLqkT/TQybcltnpBEk/tSiZR6Slzb+pjXl6gV+YTTVBrTetjKYY3U9oJbN0ZC3Vh78dNnkq046oznQkTEMupj4svCNWBfDLSpclbwdUBvPgm8IjMLN6NNiGb/s3H3gdbAMjN6fu3srtQVjronDG8df5Zza9kyR2w97iKnD2MTuuoKfWdU= X-MS-TrafficTypeDiagnostic: DM3PR12MB0747: X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0747; 31:EXi2WyJw/Q15Sv7C+qA9oe08LnQQ47m8x7sbIwNPJOiYobDz0GRtMAkZMGzwikkiSaACUj/8PM3CbldpR8lPUNooMVkQujxibZwUV/E2Z2Ae1gEqg7TyOEFlXlodnw22sYrhnCGmrWs9lxTOVF/x5oRl8uTtvBnaIqegr4RZAFUv0UcSGMTpdI772c3W6ULVa24UicxqWOFQpfcQK6GMKxYRyjzEKCFJUCtGcd5w1d0=; 20:2jAszJRcqqlFfFjWnoabYCaxDe//wNV2NJWvjn+lDjYKpCYkqibwLaSQq30lLZVO1ZljvsznbrQt69x+YLTgqLiKNmKQSDBwe+b2BSH4BxVL2rO1Nf7UkxtUvFT+eURhJR4seNLwvfeEzvkWOvljhm5qiQAfgsDeIXq1Xh/DCKXGGbtMnsmMleZjVKIA756N6Cfw8D3SHGTygh+mgh9EDeNwBrKgO9O4I6XNIgdyWFGwGel6Z/4v5kIqhk5+LVQaN4zbSaHnfnHfU7govqQKTZxFZFeC8y+o8y2ZF0NAmglZBna6bv2vCwO1RjA1ydF5j5+5LjK+1idWurQHp4n8ySn1egafd1xAs5gl8dJhUbnGecvyvX/+HwkQEpMb19Ach+gfZ4nr8FHuMQKLjj+I3FEU7JPStSats8/9CDnGUdGGGrUMIYuYLuOmV9MF1AmIEcl1QFNA9Sb+EYJojrm5qiLNTZUV10/CdmBrUQao+JpOveoRk0gA3v5OfxTmFTH6 X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93003095)(3231443)(944501410)(52105112)(3002001)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:DM3PR12MB0747; BCL:0; PCL:0; RULEID:; SRVR:DM3PR12MB0747; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0747; 4:0rJ20hJ9MqX635Mgu4rCv+u7Q4al3efHDLnzwgaZmDIt/n8QX8Fy//IpmJPDt3ZG8mcyY2Hxi+53Wv7zcROTU9N4sVsZkBdpUr35mdrUSu35JULxmNBvOEk/5sofFdjXezX6HxBFlINY0FbmDq2cR81KYGeAAqbzS5dxTFGM3tBeWZPuxDyCUCoYEsRGiK/osaNakTC0bamjSKYdNsFGBjngkar+yrWYjFLAWOKu1vIYe9/fudxiRhhNzUTla7Bca6xiWtEBzXtpWriASSOCOQ== X-Forefront-PRVS: 086943A159 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM3PR12MB0747; 23:3ioQSZnoRKRzwLxUSRK5RKqmAII7AfYKBFd3kpdNG?= 8oOoFxNAU95dDx9zJAVOk7A0ddUVjkRxJSSPn365vSmxXpO5qkr7LnDRF46KSLexZDhU7thBB+9IGkdW39RZJWrwMtD+yUW2mxUnyGb2D6paxn7FT14jQy6dEXN1ZbRZqwi0fO4BMAKo3cUp/vPN1NujswI4bY19+GzsLMqlUJlpEeZxV/HawEek3mxGMMxByRE6H9uhI2mC7YGmi+6RPi+12nnfKJp3DzbNEtAAXEslvA9s4NfSiZc3W4hC0Eoj0+YiT5bq0ciE8IsJMTe7KwQZFmf9gBcvfT1AhPqakuAoXk3Z+coBkDhBqPl/C8EfzbztAjgCTjZqV0PZgI7plBvCLsTPJF0j1vhYzMyfwBVPA9VcMtxikCN6KC/rRcOzDdmSRNdkqypdTvGbCRrkEDdSVw75zAMc1v7OoES38oBgoIHgZdZ3DfbdPNb9CBiEn+BedVpISGIxNEiKpxBMaXC2bDDHFhcfw5pAX5pkfjZlx/+yPla/EtYvMzAl1uPJ/WIFOC5xR+Gz9YjF0Lw3n1WRg+8hjTEvbpnVdMVvVbiTjiHFvO8oVhj1o7VYQY3GcmKqh0RgFwxRvx0/bW1M+lmTo5GhdhxFNP+bz5oFok98aTbTMTjwylK5vo8MmpVrjGb5GjOHCDViGwMPNk0UmOaD6F+lwtLjwF9Q2TCJK/VUiKbeeHn+aJw6Z/Xj5CgQ2DehHHIO+MZkzYFoVKB/VoiCChvQTOnBT73UoEIUaQOqspxS+Z84cU4IeY/6FehaR5eLAwN8LxhQyN+yqlML9TtggtGt7BAIj/Hhfe5z53wmC/jCujIaiiQWJOczBpr6bt2p1fmW6SaQ3EFKUpwpMJywRlchsXUJlBqWCvWNHh5JR+EeE3RyazNW/I1P3tPrI6UNUawgeC7wFSqhoMqUR0biTbjUomylOAUqlDvyzfrrVSw544rMT4+29Xl0m0eyUpbd3/UlqX+tdLc4loBgn0BfboCPICh+rksFjpYcMXnhgdB4Fz3Kp7ddcMGi9H8n72LbEKPD1Nap2I5uXTy/8FC4t/5vEvxPdxkg5H6es1Ic8Ki9/VSNFyCuQMKWXe6GxG2pccIXwR9PjFZyBfQpTscQvr/8cb90Ho9gXmjwoQrkw== X-Microsoft-Antispam-Message-Info: 724gO5WekhdGjIVd6zr+GFWBMxUlM/vOfxFDtfOGlrxFIaD2VBAFU1kZNWk/Bb8vYVL6lb+In8wwcMHpsK9Rj2d1n56TaW+4TbNcIQkE+SwnbFYkGc84iGPIVPTZDupqaECJJKos8TgTSnQGXr1E1F26A1WwS3WcKJo1VbK8AiOJIA5jDnVzt4dZJIoMH2jw5lwoSH36lwvjKn7LlygQz1c+WgM8XD7HPL4DsD/Ng3X4ZcLUOhX2QarQr4qTpGWJjyQfi/xNMdWqidGsNidQe4TSRaNaMaStDvFvLPL1DZvVK3qO+wy59KpJjpDIGoSWB/xmGh46812A4GaqFZZKVdEi0hdjXBfkSmCuvtguh7k= X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0747; 6:fmbluca3TqJc2LU/lxwpQlJIwQorJwTNNUj6PEAuPYlkHhvkf49cd8N/ZKLNcaFCA9W38Y4UpzubN3zWQtrsTKQTPnDClWL75/8hLSK2EaKv7F4MP6NAj5OHuDTTTFHpj3RQIH05mc2sJcL+R4x09LPnceALLerk4TuBJKyPTUwYlrYp2m8ENQXKD+KjcNGoT0+4VyZ+gIJ9ZNhkfVfrc83+/iqsKFfav1YwMzmsrScKD4UJKbl/kwxJHxlZoGmXVReE/0h7jXvKLNm7LYAUUzs/Be57/UuqqmMoMl2kL6dfmN0kAtVcWb/SFHT4Q4Pjgd/Dc56wgdwUavV+5+kMIJvw+cPGlVERrUuq/LBz5ZAfoNkC0s/IA4qYgiARhQkY7FEAiTZRYH5i3AP/DanQuNyAXhIEiclr0Xu16AJXRndDEM2Y+UwRCX3D6myLFUkjCiPL8vGsb6MhbfCvPBOtuQ==; 5:A8Y6MGjaNdgm4ywV9wusHhttNYyd05z7TjbxL2AjDcLEusw9vxWPrOq56qn4GPsPRnoCDXzdcNJ3RzEE4sgin026rT2jNpWg4tmsKnQvxCm72pzYVOzyzPz0ToW9tcXJuK5ywubkyZVPw/14pJHtOkLAyeHJ+7yz1PDaz4r0z9g=; 7:K4gANS8SaHz902p1TauZ1NWDEqYFnQowEK2OoBcAClVhTwvGodf0gRGtS5xmXB64PiZOS1sfrIXzp57oac2TyKkj9q3B6CA3OkHVvXcpV/OUsY6qSUGLkdqNf/8SqqTaEa303Dz0/wFjVQCg4rsVTQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0747; 20:XdpsIqmA2EDVUoui3qcsuz7W5YokmqEFdHdFH0R7wSHBgTP63rgVjSRMFy3SxmlsQTFwGms0NCqFvgFzzMN8LiJzUuv4MexZGmPxjn8m8FwhO/60DtAZEKg/eTOCFydWr70Rsu72sus3dDDSQhLGFa1KaYACSergBRF0DkgKEHmHPLgwX/K/u+k4E0xAzPYI8YgDrZG5YRW8MZZvkdCUTiDebP/R8IfwEe7044Lc7Qz1y9ihbNNWaDrSVlHlfNC3 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2018 16:18:18.0441 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa660de1-fd56-4ca3-469e-08d65483f12b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB0747 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The fallback code for getting default backlight caps was using the wrong variable name. Fix it. Fixes: https://lists.freedesktop.org/archives/dri-devel/2018-November/197752.html Signed-off-by: David Francis Acked-by: Alex Deucher Reviewed-by: Harry Wentland --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 27df3ae945be..aa3f8200fa69 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1615,8 +1615,8 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm) AMDGPU_DM_DEFAULT_MAX_BACKLIGHT; } #else - dm->backlight_min_input_signal = AMDGPU_DM_DEFAULT_MIN_BACKLIGHT; - dm->backlight_max_input_signal = AMDGPU_DM_DEFAULT_MAX_BACKLIGHT; + dm->backlight_caps.min_input_signal = AMDGPU_DM_DEFAULT_MIN_BACKLIGHT; + dm->backlight_caps.max_input_signal = AMDGPU_DM_DEFAULT_MAX_BACKLIGHT; #endif }