From patchwork Mon Aug 13 21:23:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 144044 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3543728ljj; Mon, 13 Aug 2018 14:24:07 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwVP9Y41/ZfMmggTyVb44ngiFJH4Flbe28lUMsnjtxv65BrWNfNn2X+wAHF14mQTIfAFzKS X-Received: by 2002:a62:3703:: with SMTP id e3-v6mr20636484pfa.117.1534195447271; Mon, 13 Aug 2018 14:24:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534195447; cv=none; d=google.com; s=arc-20160816; b=qNIxTnxoYvRdpjS08g1EZbhqDd6MH+JV4VymXiNMmVbZQQfqthvEGEaJV8tY/QvNj8 L89fE6yva3eusPcNsoy2iuewO4ffTA3n47pTbmz1iLxU+9bUNLyNl2ozLCYbFXuDKIWz MuHEnmjq4oG/nq8lwciOhKSqcOAqMIfgAH4pp3V1FmTBcFKQegAhfG/CZC+XN8N2eSkb wK/tojjwxMZUKibsi6D/qGv7uA9Ih0ujapdDMDPvMKZJ+Sk3QRK53GyignbN5LaAG1FP Ym1+v2HWlcBHv4zyqeu7e2vCmGhGELwq5mti2SRkR9kVT4OtFJ/OIvAMipwf8lEoeEEK i9sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=0UZuXP6x8yeAqC5dgJuXwRQsEtlSuSXPPqiaycPMRKs=; b=KmH60XNC05ngNue8uY2DKcKqZWu0R/kl8mcyffGm4M57ClPu/RXJ2N2aA17XByq5D7 sKVyROjBlVroBoA/lHfNruzi8XZBZlMc2TjhL8gXcPHS2E/ZmzlLIF8DzrdKyOlB9L1+ b1VYzIfTkK5oHNtOkGbKSUkn7Iq5gAa8VSkEuY9T8aqnJbyBnbNL/oOlaP4NdWD92pWn 3f71miki1TwX53YT4OUuRz0NYmCEALxypvH+7+zrltqU3GuQCnPVhZxPvMpYyHAPbN/v 4qbwKSUG31UJzSVShni1aMi+lin8EZ6set0AO7KZGUSsp9pklWz+BQ+AmhvGJSaqDyVH kxcg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l1-v6si14387249pld.184.2018.08.13.14.24.06; Mon, 13 Aug 2018 14:24:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730524AbeHNAID (ORCPT + 31 others); Mon, 13 Aug 2018 20:08:03 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:59941 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728772AbeHNAID (ORCPT ); Mon, 13 Aug 2018 20:08:03 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0LrKaC-1g1Bkw20GS-0136zU; Mon, 13 Aug 2018 23:23:58 +0200 From: Arnd Bergmann To: Rob Clark , David Airlie Cc: Arnd Bergmann , Jordan Crouse , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] drm/msm/gpu: fix building without debugfs Date: Mon, 13 Aug 2018 23:23:44 +0200 Message-Id: <20180813212351.2555757-2-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180813212351.2555757-1-arnd@arndb.de> References: <20180813212351.2555757-1-arnd@arndb.de> X-Provags-ID: V03:K1:5C9zMnJIm2j7aonRZ0RUaJoxxro5gafvjRhMgH0MCak7wLdTkUa zyun0g7K1f1otb2jXQNiADlqmeT57rnDB+VmT6MUZvsvJ4zT8zbYoXQJuBAVsZOyU9LyZ57 stSrWwmSPiA37Vb5PmRVPxQ3ejBNQND3EPkt4NlwHBcnEBsBHUBV27TxejoWSYklzpkZ+AQ Qwy6CcqCidW5tswvVwn6w== X-UI-Out-Filterresults: notjunk:1; V01:K0:7dhPx8wMYqI=:f3Ougk7mbz7qgLOnustbh0 dejwPbW4f4RM16aI1nylAUyPn/8Y8jdBNrEhhFQoIdb3MUGUhUi1nngO0yguKM1KliTX4A9QA H072eOE4bPtyeaRIOV2r33zU7XJhk1/mG8CVgjHAKDlxcGyFcOYeW2ItFoF7sE5zkWlKD7n5Y daMcQnn1W3i6A3Detjs3N6gcpn8Ussx5vUbGvS20vCpbltcPEN+bmoTuVcZWc0eIyDYMJHTeH vhBqchwiC69ZPiw3O2V/L0R6nYdRhBXo/erH69XHCpeykz2ffyuSV+/6XG/Phi5eHcn3EGrX2 tL+QSWqq1VUToI56K9fqy35WwUYQeiFjRhiDKeSbK99iKfaCnqqJ6b6WbKNg1pXM0BNLdjvAC MgAhh2Xq0tLYz2rEgrvN+45J/QfTceOAM7WFWXkxK9MwNVK4P/Z5kFe3SDmYZ5ySL6AaY4ht6 CqYfTt7wkeWtiHjekfwAwL/kydyoq2pDFoCZenP/ibrbkIaoPNXqZAha9HgmWzH5HLgiBEybn FoFbEs7BVp0zrZRMNCHf46D/HYT4wDkpCA3Tl08nR/feLtLnU+MXKLyJ0LY6cjRXp1eznKgt1 RV7e2jlBMVVcv/jtcnqF+hOT7YfaKXP6B7ZZ7i7drMwRWWhXtZjeq8g/2V337Nwkjt7HPl0Rh QgF3MkPEz++ZsGYwspULobzZPmq5uLe3ry9fkkaXaQxV0KdFfOXzt6UPhfGEpwBI5IFg= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When debugfs is disabled, but coredump is turned on, the adreno driver fails to build: drivers/gpu/drm/msm/adreno/a3xx_gpu.c:460:4: error: 'struct msm_gpu_funcs' has no member named 'show' .show = adreno_show, ^~~~ drivers/gpu/drm/msm/adreno/a3xx_gpu.c:460:11: note: (near initialization for 'funcs.base') drivers/gpu/drm/msm/adreno/a3xx_gpu.c:460:11: error: initialization of 'void (*)(struct msm_gpu *, struct msm_gem_submit *, struct msm_file_private *)' from incompatible pointer type 'void (*)(struct msm_gpu *, struct msm_gpu_state *, struct drm_printer *)' [-Werror=incompatible-pointer-types] drivers/gpu/drm/msm/adreno/a3xx_gpu.c:460:11: note: (near initialization for 'funcs.base.submit') drivers/gpu/drm/msm/adreno/a4xx_gpu.c:546:4: error: 'struct msm_gpu_funcs' has no member named 'show' drivers/gpu/drm/msm/adreno/a5xx_gpu.c:1460:4: error: 'struct msm_gpu_funcs' has no member named 'show' drivers/gpu/drm/msm/adreno/a6xx_gpu.c:769:4: error: 'struct msm_gpu_funcs' has no member named 'show' drivers/gpu/drm/msm/msm_gpu.c: In function 'msm_gpu_devcoredump_read': drivers/gpu/drm/msm/msm_gpu.c:289:12: error: 'const struct msm_gpu_funcs' has no member named 'show' Adjust the #ifdef to make it build again. Fixes: c0fec7f562ec ("drm/msm/gpu: Capture the GPU state on a GPU hang") Signed-off-by: Arnd Bergmann --- Not sure if this does the right thing, but it does fix the build regression --- drivers/gpu/drm/msm/msm_gpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0 diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 9122ee6e55e4..1fe93920fb25 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -63,7 +63,7 @@ struct msm_gpu_funcs { struct msm_ringbuffer *(*active_ring)(struct msm_gpu *gpu); void (*recover)(struct msm_gpu *gpu); void (*destroy)(struct msm_gpu *gpu); -#ifdef CONFIG_DEBUG_FS +#if defined(CONFIG_DEBUG_FS) || defined(CONFIG_DEV_COREDUMP) /* show GPU status in debugfs: */ void (*show)(struct msm_gpu *gpu, struct msm_gpu_state *state, struct drm_printer *p);