From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 ED2A7C43603 for ; Tue, 10 Dec 2019 20:31:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C66C520652 for ; Tue, 10 Dec 2019 20:31:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726968AbfLJUbN (ORCPT ); Tue, 10 Dec 2019 15:31:13 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:46133 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726364AbfLJUbN (ORCPT ); Tue, 10 Dec 2019 15:31:13 -0500 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mw8gc-1hpI030rKO-00s44T; Tue, 10 Dec 2019 21:31:03 +0100 From: Arnd Bergmann To: Harry Wentland , Leo Li , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "David (ChunMing) Zhou" , David Airlie , Daniel Vetter , Zhan Liu Cc: Arnd Bergmann , Dmytro Laktyushkin , Bhawanpreet Lakha , Jun Lei , Charlene Liu , Eric Yang , Nikola Cornij , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/amd/display: fix undefined struct member reference Date: Tue, 10 Dec 2019 21:30:46 +0100 Message-Id: <20191210203101.2663341-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:6Y2/uQlFVUAl2FLpNaMIEOkGmiPd6/841XgCPxFoFzLNddBwEXH Gv0mA5U4F2XyfY5t7Irv9sGvE7omtf7B7anfrVJBcEa6nJh0oGgFa3a8TjQPfIv9chsmwPT jvm00bAGb9IDmiVsEt/HDimufrl4EuajG0pezWC+Cd9W5Z3cXKjNuVPnbUu6xNF5mo57oYn vjtK9SqzVDqza+VajFYtg== X-UI-Out-Filterresults: notjunk:1;V03:K0:nvvWyV4d47I=:igjZJHss92gevPEg0s6AeJ irNg5oTb0g/mz1SP58BRWPJSUPXagn9fT5Q282PRr4qjKcGuqUqdPcXxozfe+lB8JSjqAtAGw uGrMQgtCqCSRhrmYPiIvqAvYo7eKNTHjgm5zzL+bvo9/CHEzMDRNSIV7lUKhGjbHAClQMc8c7 GlE5a+tlT+8othshZhcQR4ci6Pr2UmYOudQalhqK0FT3R1UV5qW9PQ02gnzVmeqVwr8kIlJDv 8hlVZ1hkWffCyUrLjn0vH+xN/T6TWgnWt+pJTNBPdIYjibiIKuItvsKNill74VNUq3R/Kgh/V 6C6ONZlPZdxOlv3KSBoMTYET6qDuqe7QIqBbeqar9KHm+OhvaT8Oi2mBTCr9Ebb4ITtqpVHIZ k50AT2eOTHY5gRKN3y6dURvxJPLaNTVNVRSDQLVquHAsvnq16pI2hRHsyfUddNkOdKg8FVKGf BToTy7SZam/OruTSwmLzD2ZboH7k3sc+6HbQ+hBNHkDSNS/fzNmcpKJZ0pn1TdrdbIdJVqMC/ jMwXwnoDMWLCak14H7Wgws8CcQkZCddWhNXS2qO3EOHS34zybzsKNNXd0Y8WmYupY8xDr+ec+ sbZB7GEbT3OhMcmh9VKJsGypjTr45ZjUJjJzf4ZhnrukVS/57Y/133obTCJn3PUT9bdP6a0Gq CCQSrwldYAAxNi+wQCxvY7r/8JJO6YxFLt/UEeXdDcYWXY+qwESm3KQEQdgsusLFVxLYdhoHK 83cyamaR95AcqjPE+P6lB3yo112Lk2GKxGxl4T/yNKfnnecQcJQoQ96ep8o7xWFSso8fdyte9 xYjZnAYcSEBleU5p/+5gbGi1R2S9x1j3AMcpJo1yAJn3p4G8DD0Q8XSAHsyN9rJksdRVvZxI0 jyJZTahwNkriE15CwfTw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org An initialization was added for two optional struct members. One of these is always present in the dcn20_resource file, but the other one depends on CONFIG_DRM_AMD_DC_DSC_SUPPORT and causes a build failure if that is missing: drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_resource.c:926:14: error: excess elements in struct initializer [-Werror] .num_dsc = 5, Add another #ifdef around the assignment. Fixes: c3d03c5a196f ("drm/amd/display: Include num_vmid and num_dsc within NV14's resource caps") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c index faab89d1e694..fdf93e6edf43 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c @@ -923,7 +923,9 @@ static const struct resource_caps res_cap_nv14 = { .num_dwb = 1, .num_ddc = 5, .num_vmid = 16, +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT .num_dsc = 5, +#endif }; static const struct dc_debug_options debug_defaults_drv = { -- 2.20.0 From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 B508AC43603 for ; Tue, 10 Dec 2019 20:36: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 91B6020652 for ; Tue, 10 Dec 2019 20:36:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 91B6020652 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de 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 2716D6E92F; Tue, 10 Dec 2019 20:36:22 +0000 (UTC) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id EE56B6E92F for ; Tue, 10 Dec 2019 20:36:19 +0000 (UTC) Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mw8gc-1hpI030rKO-00s44T; Tue, 10 Dec 2019 21:31:03 +0100 From: Arnd Bergmann To: Harry Wentland , Leo Li , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "David (ChunMing) Zhou" , David Airlie , Daniel Vetter , Zhan Liu Subject: [PATCH] drm/amd/display: fix undefined struct member reference Date: Tue, 10 Dec 2019 21:30:46 +0100 Message-Id: <20191210203101.2663341-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:6Y2/uQlFVUAl2FLpNaMIEOkGmiPd6/841XgCPxFoFzLNddBwEXH Gv0mA5U4F2XyfY5t7Irv9sGvE7omtf7B7anfrVJBcEa6nJh0oGgFa3a8TjQPfIv9chsmwPT jvm00bAGb9IDmiVsEt/HDimufrl4EuajG0pezWC+Cd9W5Z3cXKjNuVPnbUu6xNF5mo57oYn vjtK9SqzVDqza+VajFYtg== X-UI-Out-Filterresults: notjunk:1;V03:K0:nUCT4AGSbt0=:GtLA8NfJI8V/5FpLgu6FDN 0GWnhC47LM7i0xJDSuKrI2pgwypyDZZVdfiXcE0tagEQ+IBEjd1QPsKtJfoXvnA9VLmEeJCPD wyaFQLSiCzSDT+TTCtrxzMW2JSyjsY6kCZkhXltjIxiKpgs/xvcbU6xCvRupJcGnPnDEVKySE +MefHaC7DOqZ51Kg+H/lb/1jK/xC6YBZWVQxygixc8GFZHT52n6R8Wk+XWSYkj/lFDYiwizP1 fhJsKZoQb6FHskOf4iAGsxniiZ7Ej6a+J3On1G37KNf+B21qsxW8dzDhUJSpu97G2qer6oWqI dvgbaGCLIAnYMsbb8rngG9LUjtIjQLC4pnFMkPS6QDv8MI046eHA9+WqbUBTGs3jWoM8avzaA XkhTh7wWAbN709w+vKRXNMB+Ujf6Dt4RzCXUGRSJ43IibCFimt+hhDqRDyXC6tk64Ro1TYt+K bgqdktlDzrohU7J61mNIGCntILFDDVJfU9MHxsINPzz+Ad+n6TJxe1hCOT5bSvCE3Nf7CXsgh H3HPlJaO2Ug+SCc7CIEDgy3CQBDts1wO5QCLZlSgOJ78DPOmaKO6STb6TcOLAlSud/AC3e8G/ 2KfpmQFknX/ESEF+1iTd72TSOqhoI1A0u+7uw91IcghJuftDvlzg2iwJamdKovO5CydyAZzW0 QxtXp5HXot4ATK1pzlwSooSSg48g5fR7KfCG2Tm1eyNf4xWSzVeMljHNHv36d7s6Uaw2oiGod AcRHHdW82EFu7O3yGepgUiDBMszdSt8QzwK8RI95VLAIJQA8sodVaDwGrfaUYxWR7g2Bvm0o7 rLSbAFEIosgmr6MMU6eXfXswea/sjMeCEsCjakehElx4jdbyhcCzp59tPhwBS8XTEPiO/rJKz 4CU7gcgMhl/AFHfbrWBg== 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: Charlene Liu , Eric Yang , Arnd Bergmann , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, Nikola Cornij , Dmytro Laktyushkin , dri-devel@lists.freedesktop.org, Jun Lei , Bhawanpreet Lakha Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" An initialization was added for two optional struct members. One of these is always present in the dcn20_resource file, but the other one depends on CONFIG_DRM_AMD_DC_DSC_SUPPORT and causes a build failure if that is missing: drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_resource.c:926:14: error: excess elements in struct initializer [-Werror] .num_dsc = 5, Add another #ifdef around the assignment. Fixes: c3d03c5a196f ("drm/amd/display: Include num_vmid and num_dsc within NV14's resource caps") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c index faab89d1e694..fdf93e6edf43 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c @@ -923,7 +923,9 @@ static const struct resource_caps res_cap_nv14 = { .num_dwb = 1, .num_ddc = 5, .num_vmid = 16, +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT .num_dsc = 5, +#endif }; static const struct dc_debug_options debug_defaults_drv = { -- 2.20.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 1ACC6C43603 for ; Tue, 10 Dec 2019 21:37:01 +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 E83962073B for ; Tue, 10 Dec 2019 21:37:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E83962073B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE8856E9A3; Tue, 10 Dec 2019 21:37:00 +0000 (UTC) X-Greylist: delayed 770 seconds by postgrey-1.36 at gabe; Tue, 10 Dec 2019 20:44:01 UTC Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id 338906E176 for ; Tue, 10 Dec 2019 20:44:01 +0000 (UTC) Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mw8gc-1hpI030rKO-00s44T; Tue, 10 Dec 2019 21:31:03 +0100 From: Arnd Bergmann To: Harry Wentland , Leo Li , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "David (ChunMing) Zhou" , David Airlie , Daniel Vetter , Zhan Liu Subject: [PATCH] drm/amd/display: fix undefined struct member reference Date: Tue, 10 Dec 2019 21:30:46 +0100 Message-Id: <20191210203101.2663341-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:6Y2/uQlFVUAl2FLpNaMIEOkGmiPd6/841XgCPxFoFzLNddBwEXH Gv0mA5U4F2XyfY5t7Irv9sGvE7omtf7B7anfrVJBcEa6nJh0oGgFa3a8TjQPfIv9chsmwPT jvm00bAGb9IDmiVsEt/HDimufrl4EuajG0pezWC+Cd9W5Z3cXKjNuVPnbUu6xNF5mo57oYn vjtK9SqzVDqza+VajFYtg== X-UI-Out-Filterresults: notjunk:1;V03:K0:vdsCwXbpzhg=:2/m5Z7ZQQBf3seyl4RgIjA kEgFyOHJByuNzd7+4YEk0taGPGNshYjpBoswGFxCc9SECIhb4FmUjgGEBjHTBoQEWAseRmZLa eSHGC8oaoaFgfHQ2vBTorrXoKwPKb634wEqE1U92NrLaNfSV+1bUDBf0xWyGgFzwL5gPEIh2Q B6n3RT+Zrg14GLvnjX3En0Ji7HP8nuQk4lXzwxHmTFWIxLXgNNq3Qju5xE1daM6ut6e4JATpk 5wQMRYeQ6wf7z1F1V+IgL4LpCYqFshlxwKe6gpafF0JwzKVQxoxFY+FsQI8wXIH1qfK8BWDWU E7dfdOKXSTRFMwlwxxozxebF5bE25OfvCPdbvZBdv6enrzpOmaiGstXcqggQkyUSVR6I4fUGV 45wyWTNqJHOxuO6wS10sJN+3IJ6zrvavEpex+apxGq6z4cyCY8gUOfXoVNW0ohOuwqa7QCD9/ xGrA7PSqRusqpjeXtcgvrxxDlf0NoqJYT8iGCiCFd9F+QgNbxSOzTDwiF0H7RNrvqqu3poMKk nIi5jUJK8+Ri/7xN2uxMOTlVtpvugx87AroAKTbRcwhBDovlbntaT/VbTAaW4JKE83Yw5GXWg NYmvHJxC5K1WdV+Ov5NWz3OkVqwJHlfSgXVR5Fn7NIMmPWq2lv+UlfXrZpkua+RDqlQKss0xX ycmDGkhWGIoblsA7wwl8nnupnmNxKjPLkyI+RQejIXCQOAYIu8V+UzRWEHKTlW15vexfArmaI B9CuCd/zJ937l/rYfxkOzDvu9OWHk54wJgxcKEuTxxenU3PBW3Qrdl3TYeZDtaHWVo/8hj3qP +aPeMRhawu4ypdVHhvtZJGSw6UWK13MvQKu4guS3mf40Cc9glcCqtpdCxKNhhQ4oYW5Y75vxZ qe1+jdqi280uRh10rrow== X-Mailman-Approved-At: Tue, 10 Dec 2019 21:36:55 +0000 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Charlene Liu , Eric Yang , Arnd Bergmann , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, Nikola Cornij , Dmytro Laktyushkin , dri-devel@lists.freedesktop.org, Jun Lei , Bhawanpreet Lakha Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" An initialization was added for two optional struct members. One of these is always present in the dcn20_resource file, but the other one depends on CONFIG_DRM_AMD_DC_DSC_SUPPORT and causes a build failure if that is missing: drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_resource.c:926:14: error: excess elements in struct initializer [-Werror] .num_dsc = 5, Add another #ifdef around the assignment. Fixes: c3d03c5a196f ("drm/amd/display: Include num_vmid and num_dsc within NV14's resource caps") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c index faab89d1e694..fdf93e6edf43 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c @@ -923,7 +923,9 @@ static const struct resource_caps res_cap_nv14 = { .num_dwb = 1, .num_ddc = 5, .num_vmid = 16, +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT .num_dsc = 5, +#endif }; static const struct dc_debug_options debug_defaults_drv = { -- 2.20.0 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx