From patchwork Wed May 18 16:07:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102326 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2722003qge; Wed, 18 May 2016 09:08:39 -0700 (PDT) X-Received: by 10.36.53.84 with SMTP id k81mr5946060ita.59.1463587719017; Wed, 18 May 2016 09:08:39 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id oy2si8260699igc.75.2016.05.18.09.08.38; Wed, 18 May 2016 09:08:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) 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 73BB56E883; Wed, 18 May 2016 16:08:37 +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.126.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A2BE891B5; Wed, 18 May 2016 16:08:14 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0M8u6u-1ar0nB0bhk-00CAGH; Wed, 18 May 2016 18:07:46 +0200 From: Arnd Bergmann To: David Airlie Subject: [PATCH 1/5] headers_check: don't warn about c++ guards Date: Wed, 18 May 2016 18:07:29 +0200 Message-Id: <1463587653-3035181-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1463587653-3035181-1-git-send-email-arnd@arndb.de> References: <1463587653-3035181-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:GVrd8RhmDeRcHN+5+Ktd63gqwa4gJ3by9zkRhoxZaTwZhT5olQp mEOcii1XyW0b7KEjrKPwDW0yjRd+GUfd91e3oPoDMr8cNpUDELgtZghp7PplRxVxbtbYja5 DG3u0dQFpZYE+jL5Gwtf+/yCjbe/CYR5/JLjhpdU5EenkC3ktmkXYBEH4cpDvlLSzfHb8SL Dd9vBlz/AUcNlLQ9lFpaw== X-UI-Out-Filterresults: notjunk:1; V01:K0:sAP0I6DN8+8=:PHHnE5R9tGlv3HczsdDuSj gnPJ4ZL/yEyAsLRYhjrE+gfo0xs61ETmOjCyQuxZFxUVxjIW6Pbp70M0IQQxhJZPcnXS9JMMc 6IjNO9FxrWBMmfeVbq5+pnqsxjt/m1/oDOD/V+c/60ptIMl6Nt8EGpGo42AUwfuiVOc8U7OyZ mtjJnT6YbNWXQ2387CG7tfWIiwKcJbHojNiMJyKMjocHo3GZE5uIkET5sqKtSa7GVg96wXbNS tLiKv6dYx24exrDWfPyf50cm6NS3Px8ZKHW4u9xmF/S3xxF1/wlGP1toJvLwTPbyNYj7P+x8K SJzP7B3d41e1SxB8UouK77snSSNmlNyQ4Zd2BEBvq6nszFH5B+7Yv5gki1mABXnhYMtKXpk9G 7I+gNfR0kG698gD8j4kuFfC1yxdEMgzQl1Kk8yd/h2SsRtllDHVPD14WT5Wssoa5n2ZFzzwVV 0vK92OlA+86Au0JGqQNmVv4iZfuYtaGRJo66xo3o7M0mBzL1U+4dH3o+lYlBR/hyrBVzb8Iqt 8G2kcwskFK9lziHPeHFDLJeLDsKLYXg9GPe2u01PtngPqvk1fsly+4dH5iw/v1sYAjGs5iZDY hYyuce4UDkFqByCqe4hSA0eUhw/wfBkfv9AxTk1E9QdsJ9TY9YDrg3lfGxsGwVCuFciTSCH++ em8YqrMxxr20YiZ4rHVSHa1mgjPCPAlAdfm2cnU0Mhj3ywwHmYE7++QiMwDpIeM4WU+cv8joP uerqd3YAWGHhRUzV Cc: Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, Arnd Bergmann , nouveau@lists.freedesktop.org, Seung-Woo Kim , Russell King , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Alex Deucher , Kyungmin Park , Kukjin Kim , linux-mediatek@lists.infradead.org, Ben Skeggs , Matthias Brugger , =?utf-8?q?Christian_K?= =?utf-8?b?w7ZuaWc=?= , linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" A recent addition to the DRM tree for 4.7 added 'extern "C"' guards for c++ to all the DRM headers, and that now causes warnings in 'make headers_check': usr/include/drm/amdgpu_drm.h:38: userspace cannot reference function or variable defined in the kernel usr/include/drm/drm.h:63: userspace cannot reference function or variable defined in the kernel usr/include/drm/drm.h:699: userspace cannot reference function or variable defined in the kernel usr/include/drm/drm_fourcc.h:30: userspace cannot reference function or variable defined in the kernel usr/include/drm/drm_mode.h:33: userspace cannot reference function or variable defined in the kernel usr/include/drm/drm_sarea.h:38: userspace cannot reference function or variable defined in the kernel usr/include/drm/exynos_drm.h:21: userspace cannot reference function or variable defined in the kernel usr/include/drm/i810_drm.h:7: userspace cannot reference function or variable defined in the kernel This changes the headers_check.pl script to not warn about this. I'm listing the merge commit as introducing the problem, because there are several patches in this branch that each do this for one file. Signed-off-by: Arnd Bergmann Fixes: 7c10ddf87472 ("Merge branch 'drm-uapi-extern-c-fixes' of https://github.com/evelikov/linux into drm-next") --- scripts/headers_check.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl index 62320f93e903..8b2da054cdc3 100755 --- a/scripts/headers_check.pl +++ b/scripts/headers_check.pl @@ -69,6 +69,10 @@ sub check_declarations if ($line =~ m/^void seqbuf_dump\(void\);/) { return; } + # drm headers are being C++ friendly + if ($line =~ m/^extern "C"/) { + return; + } if ($line =~ m/^(\s*extern|unsigned|char|short|int|long|void)\b/) { printf STDERR "$filename:$lineno: " . "userspace cannot reference function or " . From patchwork Wed May 18 16:07:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102330 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2721711qge; Wed, 18 May 2016 09:08:10 -0700 (PDT) X-Received: by 10.66.229.33 with SMTP id sn1mr12284426pac.49.1463587690836; Wed, 18 May 2016 09:08:10 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id z68si12925833pfz.158.2016.05.18.09.08.10; Wed, 18 May 2016 09:08:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) 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 796826E87F; Wed, 18 May 2016 16:08:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 8555 seconds by postgrey-1.35 at gabe; Wed, 18 May 2016 16:08:03 UTC Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7691A6E87E; Wed, 18 May 2016 16:08:03 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0LfbRK-1bNIbp09Iw-00pKUp; Wed, 18 May 2016 18:07:47 +0200 From: Arnd Bergmann To: David Airlie Subject: [PATCH 2/5] drm: mediatek: add CONFIG_OF dependency Date: Wed, 18 May 2016 18:07:30 +0200 Message-Id: <1463587653-3035181-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1463587653-3035181-1-git-send-email-arnd@arndb.de> References: <1463587653-3035181-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:TzxTaKALW2zsmNu5KCMXfTZxG2oAsS7QmZh6ie8GQYenrM1rbFL 9KIHQzn2h2m6SbAoPgeQWYcjogzm4xOGaTrszP3lul+P4sHof2KV+cUn+/w7XuXT2uPpZDR SxJ/qT2sMfiSnGO5rlNJpWy14lSwL6Hab3Oabb5PPYa8bW6AKuePuTl0CBIi3n766SDyVoI pq6kPYu6eyMCQ9QgDGCRw== X-UI-Out-Filterresults: notjunk:1; V01:K0:LQI9Jfc/oOo=:lzLPgNndMW1b4fmjMOZPtQ F3xYwNhasHzcbDRYZVojmC0YazDN+nC5TMzU0720l/Vw5HmQWBXXggD8GCyzhXFPSwjzzdQXH 7Tn+TA09hCC19/o39nYVqeQj+xsT3ZykJduHB+rUuyc56n4EJ0RgqsVANXoksnELDvr0kc/2v ABoyD/4oIeG57wYq0MBIIIDRlEOCQRGQwFopmAG+o+1tKMgabbRE4rwqi+doaWJBlV2cVPxXC 773/STakk/zmv7F1V4QR1xf0CEZO0RZZGI00Qn/jDtFGaAf4BAXaimltRWOXYwInl1TsqMULy RB1Fo8hxTS4WUGf8pJSEFHqOHIp36Iice57nVtt2RwlY71De6UlXRhNlBQa/ocz9+FGtbwBka gHUpdXNIDvFNb0NBVjFPLHoD/EJeK2a85PXyhKgG7E4idArP4/bWZgbgr83tvFLcKq5o+sXWm SsHRe/qyfEPsacW+PGCWv8Ej1ZRkXkrwTBb1/eV8ijh5fVbpsuz+y2+H5IIVIVVZg5mLPNh57 KmjjVLkXrSajp2cakFjm9ufS3zHm0W7zNmEzCdbaxpTlrPxOqMGngPWEwi4BVXQO/cFU5JdI4 2HU30Fzgkdls7F82EW/L6erdu5DoY0Ds7WM6J3A6/XNb7fiLa6IRZ9oqwdmR/h1Xiuxq1YJ06 nLEXcKusA0WvLfPoSTAZo3OUj3wWWtHceZIh6R6NUzy4jnN8ZNf3YphS3GTcqvRCK9G0cxJb4 QqA1wRyigdLHOeC9 Cc: Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, Arnd Bergmann , nouveau@lists.freedesktop.org, Seung-Woo Kim , Russell King , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Alex Deucher , Kyungmin Park , Kukjin Kim , linux-mediatek@lists.infradead.org, Ben Skeggs , Matthias Brugger , =?utf-8?q?Christian_K?= =?utf-8?b?w7ZuaWc=?= , linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The mediatek DRM driver can be configured for compile testing with CONFIG_OF disabled, but then fails to link: drivers/gpu/built-in.o: In function `mtk_drm_bind': analogix_dp_reg.c:(.text+0x52888): undefined reference to `of_find_device_by_node' analogix_dp_reg.c:(.text+0x52930): undefined reference to `of_find_device_by_node' This adds an explicit Kconfig dependency. Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/mediatek/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig index 545973f6b743..67183e26971d 100644 --- a/drivers/gpu/drm/mediatek/Kconfig +++ b/drivers/gpu/drm/mediatek/Kconfig @@ -3,6 +3,7 @@ config DRM_MEDIATEK depends on DRM depends on ARCH_MEDIATEK || (ARM && COMPILE_TEST) depends on COMMON_CLK + depends on OF select DRM_GEM_CMA_HELPER select DRM_KMS_HELPER select DRM_MIPI_DSI From patchwork Wed May 18 16:07:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102328 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2721770qge; Wed, 18 May 2016 09:08:18 -0700 (PDT) X-Received: by 10.98.92.71 with SMTP id q68mr12402609pfb.138.1463587698315; Wed, 18 May 2016 09:08:18 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id c10si12907261pat.170.2016.05.18.09.08.18; Wed, 18 May 2016 09:08:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) 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 B41546E888; Wed, 18 May 2016 16:08:16 +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.126.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6A226E87E; Wed, 18 May 2016 16:08:05 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0Ma9tP-1bIGY02kuN-00LpBC; Wed, 18 May 2016 18:07:47 +0200 From: Arnd Bergmann To: David Airlie Subject: [PATCH 3/5] drm: mediatek: fixup drm_gem_object_lookup API change Date: Wed, 18 May 2016 18:07:31 +0200 Message-Id: <1463587653-3035181-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1463587653-3035181-1-git-send-email-arnd@arndb.de> References: <1463587653-3035181-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:6ZHdP2hov9QHc9KslieTVRTMya3Q7GmXEdLlxaxcwBrvIQilyy/ s8Qc/AYV5rXaUFhci7yN6btkaJwP4GkbKcNNHusW9Bu/CjCdag3V4U7B0Ta6egNeTHErtw3 UU004a6rzftwd4jiD9Rm4vhHK0g972wzVqUs8G+7MygDT0uZ/z0xF/T1kaKL8+cVPvWpGRn RHgPOn1LZ5vD/NVKbo4SA== X-UI-Out-Filterresults: notjunk:1; V01:K0:VgPS6mUYZ9M=:G1nM6hGXQZ0y0yC86LSfyL BiyRBdXZm50m5pXmWkE4Ds2sO9LZ6Pi7MtVLj5LIsEjNZHXGOXFLrGJe2rg6Gwtu2fTPrCVty HrtJemEgXDWUdXgMglST2z3tfvSIMaV+3mrxaIGZGHuahEKjmW8daVoRfkfogHWmltfBDvpHd MN/sVAU3JK3DDYF/R5hKaf9MuQ/8+JA6ynDzDy+RiXwNR9pTGOX4kCRApOTMCmFNhGXQ9wPd8 JrCByn5bvlWax38buecxQkmhb5TnjREOhK3BHyITKbJ7zbv2QF2KzD6z2OWUR3Ijn399y6sgZ o/t/AgF+IsnUpH90TlbW1kOLJJSXG3p6b8e57w0kPGVAid+kdSg4+KRWBZwNa9k3gG1GUlNQa /FfxXnK7VKRPLiD/nENECY0kAoEXdzzdhqVrU/PjvDRJgzqjFT6IeWzR+3sMnU9uK7nsdzIYc fpJyI6NBX2q51XDbb6UR2H5ep1aV4+tXewQQ0x5ZeylKXavJJtyFEda6JfxLzuBF7OdF/RktH HWYfEZY+GljnF2Az5oNccBWrpfyVPkS2cEpNFq31jtai9ssgp4ZcEEN2aUgQ+LN8+MTnOZRup 2JaXgSZRpSmVgcCxzchyCtLUHtfjyBZDyCUyXMu1gpJpBiw8t3PjLeUOyJRvMPuzOptUaDYu2 42W31//QZVzuf5V2X33UxKUDd7lKFKspfNq4LPl+OJ0Vi0JeSIeUeY80MMa4GibHkUPrOvAFG 0oKJCwYD/Ltmscoi Cc: Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, Arnd Bergmann , nouveau@lists.freedesktop.org, Seung-Woo Kim , Russell King , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Alex Deucher , Kyungmin Park , Kukjin Kim , linux-mediatek@lists.infradead.org, Ben Skeggs , Matthias Brugger , =?utf-8?q?Christian_K?= =?utf-8?b?w7ZuaWc=?= , linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The drm_gem_object_lookup() function prototype changed while this driver was added, so it fails to build now: drivers/gpu/drm/mediatek/mtk_drm_gem.c: In function 'mtk_drm_gem_dumb_map_offset': drivers/gpu/drm/mediatek/mtk_drm_gem.c:142:30: error: passing argument 1 of 'drm_gem_object_lookup' from incompatible pointer type [-Werror=incompatible-pointer-types] obj = drm_gem_object_lookup(dev, file_priv, handle); This fixes the new caller as well. Signed-off-by: Arnd Bergmann Fixes: a8ad0bd84f98 ("drm: Remove unused drm_device from drm_gem_object_lookup()") --- drivers/gpu/drm/mediatek/mtk_drm_fb.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.c b/drivers/gpu/drm/mediatek/mtk_drm_fb.c index 33d30c19f35f..147df85399ab 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_fb.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_fb.c @@ -138,7 +138,7 @@ struct drm_framebuffer *mtk_drm_mode_fb_create(struct drm_device *dev, if (drm_format_num_planes(cmd->pixel_format) != 1) return ERR_PTR(-EINVAL); - gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); + gem = drm_gem_object_lookup(file, cmd->handles[0]); if (!gem) return ERR_PTR(-ENOENT); diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c index a773bfaea913..fa2ec0cd00e8 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c @@ -139,7 +139,7 @@ int mtk_drm_gem_dumb_map_offset(struct drm_file *file_priv, struct drm_gem_object *obj; int ret; - obj = drm_gem_object_lookup(dev, file_priv, handle); + obj = drm_gem_object_lookup(file_priv, handle); if (!obj) { DRM_ERROR("failed to lookup gem object.\n"); return -EINVAL; From patchwork Wed May 18 16:07:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102327 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2721790qge; Wed, 18 May 2016 09:08:20 -0700 (PDT) X-Received: by 10.98.87.220 with SMTP id i89mr12085289pfj.107.1463587700113; Wed, 18 May 2016 09:08:20 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTP id m76si12931019pfi.178.2016.05.18.09.08.19; Wed, 18 May 2016 09:08:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) 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 6BD076E882; Wed, 18 May 2016 16:08:17 +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.126.135]) by gabe.freedesktop.org (Postfix) with ESMTPS id 54D086E87F; Wed, 18 May 2016 16:08:05 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0LZZIC-1bQ4ZE0pOG-00lV0r; Wed, 18 May 2016 18:07:48 +0200 From: Arnd Bergmann To: David Airlie Subject: [PATCH 4/5] drm: exynos: mark pm functions as __maybe_unused Date: Wed, 18 May 2016 18:07:32 +0200 Message-Id: <1463587653-3035181-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1463587653-3035181-1-git-send-email-arnd@arndb.de> References: <1463587653-3035181-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:hTYa47QQUJyH9lT2KMoVa9Pdmx2A09W4/HrPLX/40PjhD0iXQtk FC3Q1t8czUZI2yhF44bdWysJ8YBodIAgKz4GsEj03xAxjsoW4lUvQreHf/y+BAsG6v/TuMh xbFhW0McnWhw5he4JN9KmOqKlZgJeaYZNH8wUwNqdRMPGVJ3Bvj7u/nS3A60rtuQPNNeiVA mMvi+RKQwZELom2anCMvQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:ya/rO0pk0Hw=:80AWPpaRD+dlWNLONPtZ15 l5gTjIBl1FcH0VLgIUUMrHrIrOnUd0Caty9Oui07fDTB9CobgxHKEVW2guANcR/NcidzWocGX C0qI2InfqZVyxESzMxLfINFh/g66JlP3Fg/Mtyh+o4jJcdtqRckTZZlXHwAoR61+XcjfNaZ1J yG6+Mw2X5GgIISWjy6gXwCu102TUAuN0c9M4yKj0vvoywTcqjVQWzHvaQA7Up33MtHwi5MNhE gxgnWSaKuezI+Q6bWolJ9ev1UvXCOVg1Dk/5jdRC1vwJ3jsXWnA1/S9pK1TNXpqylBDnGMohc lkPFaK6j+hBKrtbweU8Q8az2ragEdkYyo/ucbyx3wYkZf36xx8+bv4CWo4j26GrbSKp9mISDY VkmCfPNKJpM2w730MmsmWa/xDGuHI72n+BCgT89POu8OtJVNAhQTGn/p65h9KkgKZ4MMJkWi2 zUZ/0OUc+u32PDqcc6jOT//k6FXNkRipq/NheDvzmhl7wGJdE9OA5B6TcBrVvTsnpp4Bc6uRN WXPpOfmpcS9wb1aZXA7aL9exG3NNQQqhr6Dhiya/ssL5S4wY7Vl2nCK26JXkhQSXH1IYV8ydj gI3bgF0YsLxv0Jp2w4miJMZqyw2a1jNpYXEpnJYL0pc7PC+XyIOn3BDB3GXe9R7nwy+xn+e01 qtmE6RzbLk3MxxlJxzB0Hx0ZD0/YIWJD/iZLDeGfFLUuzn0TenA688JExvqDhL5bGDZy17c6i n/M48lOTQTWDtXIT Cc: Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, Arnd Bergmann , nouveau@lists.freedesktop.org, Seung-Woo Kim , Russell King , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Alex Deucher , Kyungmin Park , Kukjin Kim , linux-mediatek@lists.infradead.org, Ben Skeggs , Matthias Brugger , =?utf-8?q?Christian_K?= =?utf-8?b?w7ZuaWc=?= , linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The rework of the exynos DRM clock handling introduced warnings for configurations that have CONFIG_PM disabled: drivers/gpu/drm/exynos/exynos_hdmi.c:736:13: error: 'hdmi_clk_disable_gates' defined but not used [-Werror=unused-function] static void hdmi_clk_disable_gates(struct hdmi_context *hdata) ^~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/exynos/exynos_hdmi.c:717:12: error: 'hdmi_clk_enable_gates' defined but not used [-Werror=unused-function] static int hdmi_clk_enable_gates(struct hdmi_context *hdata) The problem is that the PM functions themselves are inside of an #ifdef, but some functions they call are not. This patch removes the #ifdef and instead marks the PM functions as __maybe_unused, which is a more reliable way to get it right. Signed-off-by: Arnd Bergmann Fixes: 9be7e9898444 ("drm/exynos/hdmi: clock code re-factoring") --- drivers/gpu/drm/exynos/exynos_hdmi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 58de5a430508..ea4b2b7d7ad7 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -1934,8 +1934,7 @@ static int hdmi_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static int exynos_hdmi_suspend(struct device *dev) +static int __maybe_unused exynos_hdmi_suspend(struct device *dev) { struct hdmi_context *hdata = dev_get_drvdata(dev); @@ -1944,7 +1943,7 @@ static int exynos_hdmi_suspend(struct device *dev) return 0; } -static int exynos_hdmi_resume(struct device *dev) +static int __maybe_unused exynos_hdmi_resume(struct device *dev) { struct hdmi_context *hdata = dev_get_drvdata(dev); int ret; @@ -1955,7 +1954,6 @@ static int exynos_hdmi_resume(struct device *dev) return 0; } -#endif static const struct dev_pm_ops exynos_hdmi_pm_ops = { SET_RUNTIME_PM_OPS(exynos_hdmi_suspend, exynos_hdmi_resume, NULL) From patchwork Wed May 18 16:07:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102329 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2721731qge; Wed, 18 May 2016 09:08:13 -0700 (PDT) X-Received: by 10.66.152.201 with SMTP id va9mr12158595pab.73.1463587693102; Wed, 18 May 2016 09:08:13 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id z6si12919822pas.133.2016.05.18.09.08.12; Wed, 18 May 2016 09:08:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) 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 B818F6E87E; Wed, 18 May 2016 16:08:08 +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.126.187]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E45D6E87F; Wed, 18 May 2016 16:08:01 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0Li5LP-1bPlRv3Am3-00nOYI; Wed, 18 May 2016 18:07:49 +0200 From: Arnd Bergmann To: David Airlie Subject: [PATCH 5/5] drm: remove unused dev variables Date: Wed, 18 May 2016 18:07:33 +0200 Message-Id: <1463587653-3035181-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1463587653-3035181-1-git-send-email-arnd@arndb.de> References: <1463587653-3035181-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:4NXHhTWGaYonvUkVLtw9jIMcI5WKV34Tle/IYdEyIlTWB4prx6w GPdip92rzB2L5oYbjxese6eFxNCAaesLlLGvxZJz2PMWUzTwNeqo5CZd/uQFf6Dy2XCxNyK rjX7UHLTUaIG6fuEs/fW7VUBuG06ssBYgrLowYUUhifPdcvgqwHQfoLpC36sOMeMQbciq1O EfIh4CmpSsRmX1tRGzcAw== X-UI-Out-Filterresults: notjunk:1; V01:K0:1Odn6bJuYwk=:46qjRUCARBz6BWGNFWLHQc k1TtPUwwA64BMAMPH+9RgdSw4StfnQJQrl7Nk1EJNcvmYAcVAlUTLp/acU7qrKdvb2vUDmaB0 sbtokans6Ww3xMrneHHvfePCpG3kWSLJNYTONkzd88rzbjP1/yyN1bFSYgiNII5gJG6KGzzOT t911KX0nc1ZkhKs5soaex1K4CI7iHvMpI4usxowZE1DfTPq2P1GMT3jg3/czGtyxC1vY2wwca DYioHjUUH3l6APF/4+iSx5cZYjp9XbVg+KU6VfB06FKrxb+A6eyPPM2PM5y+uoLI1g047rlZB 42WtXWGEqXQaB9RXRCb+2VuBlwdjcrCYOaMoaQSx29OiFpp6cTCalrHluSUYJNgdnxOw0Zwmq jtQe8dMdXzr5OGOMvn4fIM4IjtBrzHKQpgUy6InRSGgtVMXdscvUfvqoSOQkAw6BdqTLZcllj fBGTEIu1XR1NuC7fp2RpKLfWQQqvnFGbD/ZHLxFpdAMFJHsi1V+4U23CQzSEDaz7zV1aINZhf xgj5JZhCIsGnrcJsnZ3cnrBBkRV41m20WCMoW3AoxQkNdz2czdKrq5Jj/eqxKbajbRQAqkPzA 8itAXYm/kgsDumps8Kq74tvZ6QWWqhwQkrdayfcM9dsFvT3sLbwqLkR59wOlg+USZIAGg2a/W DEhjquAWa3Sd4iSgGGRTmfGlxwdctv8MjAaGl/PZSD56y9BIAB2e56TmckC/yBt0rVr9zsSvn tnt/4qofCGQ+U58i Cc: Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, Arnd Bergmann , nouveau@lists.freedesktop.org, Seung-Woo Kim , Russell King , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Alex Deucher , Kyungmin Park , Kukjin Kim , linux-mediatek@lists.infradead.org, Ben Skeggs , Matthias Brugger , =?utf-8?q?Christian_K?= =?utf-8?b?w7ZuaWc=?= , linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" After drm_gem_object_lookup() was changed along with all its callers, we have several drivers that have unused variables: drm/armada/armada_crtc.c: In function 'armada_drm_crtc_cursor_set': drm/armada/armada_crtc.c:900:21: error: unused variable 'dev' [-Werror=unused-variable] drm/nouveau/nouveau_gem.c: In function 'validate_init': drm/nouveau/nouveau_gem.c:371:21: error: unused variable 'dev' [-Werror=unused-variable] drm/nouveau/nv50_display.c: In function 'nv50_crtc_cursor_set': drm/nouveau/nv50_display.c:1308:21: error: unused variable 'dev' [-Werror=unused-variable] drm/radeon/radeon_cs.c: In function 'radeon_cs_parser_relocs': drm/radeon/radeon_cs.c:77:21: error: unused variable 'ddev' [-Werror=unused-variable] This fixes all the instances I found with ARM randconfig builds so far. Signed-off-by: Arnd Bergmann Fixes: a8ad0bd84f98 ("drm: Remove unused drm_device from drm_gem_object_lookup()") --- drivers/gpu/drm/armada/armada_crtc.c | 1 - drivers/gpu/drm/nouveau/nouveau_gem.c | 1 - drivers/gpu/drm/nouveau/nv50_display.c | 1 - drivers/gpu/drm/radeon/radeon_cs.c | 1 - 4 files changed, 4 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index a9b7e0f36513..3130aa8bcdd0 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -897,7 +897,6 @@ static void cursor_update(void *data) static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file, uint32_t handle, uint32_t w, uint32_t h) { - struct drm_device *dev = crtc->dev; struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc); struct armada_gem_object *obj = NULL; int ret; diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index 445a9e2fb91a..a030e218adf7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -368,7 +368,6 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv, int nr_buffers, struct validate_op *op) { struct nouveau_cli *cli = nouveau_cli(file_priv); - struct drm_device *dev = chan->drm->dev; int trycnt = 0; int ret, i; struct nouveau_bo *res_bo = NULL; diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 47761a92926e..ec2e67eb8980 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -1305,7 +1305,6 @@ nv50_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, uint32_t handle, uint32_t width, uint32_t height) { struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); - struct drm_device *dev = crtc->dev; struct drm_gem_object *gem = NULL; struct nouveau_bo *nvbo = NULL; int ret = 0; diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 271652963fa1..510ea371dacc 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -74,7 +74,6 @@ static void radeon_cs_buckets_get_list(struct radeon_cs_buckets *b, static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) { - struct drm_device *ddev = p->rdev->ddev; struct radeon_cs_chunk *chunk; struct radeon_cs_buckets buckets; unsigned i;