From patchwork Fri Jul 12 09:40:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11041941 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 2F3B614C0 for ; Fri, 12 Jul 2019 09:41:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A34728A4B for ; Fri, 12 Jul 2019 09:41:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C47128A80; Fri, 12 Jul 2019 09:41:31 +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=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 BB95928BF1 for ; Fri, 12 Jul 2019 09:41:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D6686E338; Fri, 12 Jul 2019 09:41:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8608C6E338; Fri, 12 Jul 2019 09:41:28 +0000 (UTC) Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MDy9C-1heCYe1wgO-00A0cZ; Fri, 12 Jul 2019 11:41:20 +0200 From: Arnd Bergmann To: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "David (ChunMing) Zhou" , David Airlie , Daniel Vetter Subject: [PATCH] drm/amd/amdgpu: hide #warning for missing DC config Date: Fri, 12 Jul 2019 11:40:49 +0200 Message-Id: <20190712094118.1559434-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:ttmzMtAGFGv3mR5H495wgmiwrDzBZya2VZW2Xzjw9gDc0C+MN53 5UB0PXB44DnG+8HS0DE9WF9L/shoFZYhub56pMwP4rt06cG75xyeDrvTK/GtGzEPDV7u+K3 xNqZcPP9uY+gVpnbPafE4oEfbDJ1k/Mn+EIwxpnjBhdF6t5p9jYAqlpVDXdWtxytRR43xo7 Ddm6kup5fX/5TnKSwk6/A== X-UI-Out-Filterresults: notjunk:1;V03:K0:7sYK4wnPxhY=:GhHlrFRq70LCK1koeRxlA4 +PuyZDl1N8PyHeDbmmjhQiTm+D5xuSBzeN8Z3Yui90ycSTtMNoWJlEO2UPjfSL5o4HXLeAU9+ UZw8b2wlDWDUUJ+MXiuy9/rI2igr36QvP+h716zOp4zBODU0SSe0xdJQWXTLa6SngXUiMpT9A Ljhnoea/IcX0ty482kc5OyxlKt7SkL3wAmy52VaGEbT66vK3ooVJYrz59zHHd6jWoah9BhrRi uK+RrlEF5hd8X3WJxC0ZJipTGuqyNZdwlOGWWMreXC4X4TWdgFPVZjCVYh4RIP3b90hK6Nlmh fBV5Rx+tPp2Y8iWbvF6pgo9NWhwuqQy14+RGNXTHIsVFHTPG51gYgJ/u3jLBFPDanY2KTFfIG UVGg6LnF7/P1ShA8Z1fr4nbQh/PhmcEeOWLbqRnFHyyAeLIGM8czEjfWGrWJaKLT01NWG6//i WY8T1InyTTiCLyCw7q/Alubp0S4EcVHFOyVapZm+aSAcVrROTh1XtsoNXoq5T567gFk+qMJzV tBr2Z4jPQcfKY6qXalZqFm9dYAtflVzsQmk0b3Jv0Ov4Ly7tApkaf7+DQVu11NrJAPO14wEUk IzQVkrzY70RfovcShLm/R+DZnm2U2NeDZpKkAFZA3JqdVUtWWUY/rXbWYemgXU2dL6WKx520H DDjc6ms+z7DXRhk7bQASWB2Rro17RbsIwMDTnkwaOl7/pGYOPiEtxchSyu1Qgtyl/o7mGtZEC BH4yrhvZU7hwtKrgyUc+6hmh+wm65DU/XDF72w== 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: Jack Xiao , Arnd Bergmann , Kevin Wang , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, Huang Rui , dri-devel@lists.freedesktop.org, Xiaojie Yuan , Hawking Zhang Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP It is annoying to have #warnings that trigger in randconfig builds like drivers/gpu/drm/amd/amdgpu/soc15.c:653:3: error: "Enable CONFIG_DRM_AMD_DC for display support on SOC15." drivers/gpu/drm/amd/amdgpu/nv.c:400:3: error: "Enable CONFIG_DRM_AMD_DC for display support on navi." Remove these and rely on the users to turn these on. Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/amdgpu/nv.c | 2 -- drivers/gpu/drm/amd/amdgpu/soc15.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index 9253c03d387a..10ec0e81ee58 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -396,8 +396,6 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) #if defined(CONFIG_DRM_AMD_DC) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block); -#else -# warning "Enable CONFIG_DRM_AMD_DC for display support on navi." #endif amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block); amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block); diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index 87152d8ef0df..90fb0149fbea 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -649,8 +649,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) #if defined(CONFIG_DRM_AMD_DC) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block); -#else -# warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15." #endif if (!(adev->asic_type == CHIP_VEGA20 && amdgpu_sriov_vf(adev))) { amdgpu_device_ip_block_add(adev, &uvd_v7_0_ip_block); @@ -671,8 +669,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) #if defined(CONFIG_DRM_AMD_DC) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block); -#else -# warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15." #endif amdgpu_device_ip_block_add(adev, &vcn_v1_0_ip_block); break;