From patchwork Thu Nov 2 11:21:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 117792 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2032967qgn; Thu, 2 Nov 2017 04:21:59 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Q7LFXFJfn7FmbAzMHRrBP3k/7VtBaOEXWg5L+Egvew6RuT19ReoFZYiiwW/QcC5Gy/pRfB X-Received: by 10.99.96.200 with SMTP id u191mr3271393pgb.307.1509621719285; Thu, 02 Nov 2017 04:21:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509621719; cv=none; d=google.com; s=arc-20160816; b=kuXQHNf+hAqG8Fbk8TV0zfr0MU5+yiVfqXOurr1RF5bD2XC4HQyOCQezd1r3D4Znd2 FU7oAIXDgYX+QTumb3+PNC2/MlqouRCZlC9MeYTm8EMP8XuChNzDN7Qf8JIPJ+9kBImR iapJONbp15Z1uHU88giyUt3xbLntBWHu41saNGKY/b3w3bn0gIx2CSo5Fy/yv1XXEkLx WIktZ6Yb0QYrm8GpZpvkSavLnQ4+y3LZsKcivI+a1EiW545YccHV1pM/o9ZcYlYieGd6 mF0iZ8PEeWvYeu5YzBxhIRQAu4mXWuJzzqSa7c+i3qFIMQk389+vzN9aWKi81jtCJ+3m Q4Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:cc:message-id:date:subject:to:from:delivered-to :arc-authentication-results; bh=zDElUPu8crWI0tYYJHa7KDCaaRzmG+/LxfnizC7hs2g=; b=fIhN0KvV6Qq7jllgZmh9cpgcNgK/w41I6I057xbsLtAO7ccmBEsIOl7I1GOKaKhgqE WqiXwBSD7K4x+R8cyUnngPH2K+CH87VGomFkKkZbqrEN9svodpLA9djfprDKS8JEm0F/ euFo6WBOxhtY8mfywMr9fBayd71K98ZtzeZhIi5K5fazOLAG8blx4w9GXbXq5zlNzlXr dwz0nEldf4Fcarv5RtZtNQFAUuVnUH2IJjcM02aSkvAyywP+pLx5XSUxXg4ba3tbU/ag i2KH6qFuRGXfKPlP1yCox7hpAMoEv8ALu6i5OTTScsiOstya5Jah1rwrliBvCgQhjoac TL1w== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id r1si1774591plb.531.2017.11.02.04.21.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2017 04:21:59 -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 4E09F6E07E; Thu, 2 Nov 2017 11:21:58 +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 E7A6B6E07E for ; Thu, 2 Nov 2017 11:21:56 +0000 (UTC) Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0LwIG6-1d4Ia20ZEE-01831l; Thu, 02 Nov 2017 12:21:48 +0100 From: Arnd Bergmann To: Rob Clark , David Airlie Subject: [PATCH] drm/msm: fix msm_rd_dump_submit prototype Date: Thu, 2 Nov 2017 12:21:32 +0100 Message-Id: <20171102112145.4086005-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:pA8W5RYcPNsusP+VPa0wxkrAvJCQ9e9GDJGVxkTWuc5XjbhLujM Gxk9paXJ2tsDSHC1puMN/UXzS7/fgLLtB79hA0hmLXClI4UB3JdJs5kOHQBiFXp10e5MDwA rQvNBXi33tiSVMTI2+imCB5mS0Q5baKwUzSq5TP7ZoGo8OhFb+EWxyjEMSCUo7YXNhCR8A+ sMlTDYPrX0ZO/z9VVvKlw== X-UI-Out-Filterresults: notjunk:1; V01:K0:5tUmNZWyB4c=:riAtxbVOHvUAa5h62hudUz U3jpqptp41Jj96jgC4E8Qc5EcLvjaJb1TjufwVl4wkyD5gjnNEB9deyVwakpZIyFqTq9LVisR eXSFrg27RcFQS8cdlOXUwfZO0dLsuyvJ4WfBTScK63QhLpxUjEXGWaBuYRsj77fKLTjWGfSUI /8SlUZ5ynPUsCayZ/R8GWaAKcqAx3MnOhwqWFp4exawhkjZkUFiWu2zaToriYGdsFB0hhwIOA ahiMIx4mTZoQkGaKDoaQG3A6LFPhQku4VCg2W0v14ow6yB19tftRTUa9+AXXNsf8o3BdaSsR7 jGp3QTUbSq8iC6pI2dFXUMWjBJbEgJWlnzVVSVIGeX2W6dxUj1GNnZar0Bb0RG7cASwBERFSQ tauQSCURXdAFIcTLWw1T8TQrIOwERyH4s7n2M2WJHwhxzZDSdG4jZY9TfTlGxrX1HYWbQH28D Dp7CsIMSibuRnQyQzfzjWnWTTx8Zf0/+XamifvEc61dBpRgR8JYfjbbeYnMKyABZZdvpS7iPa Lh5Dm9E+yPIip0IOOhtEN/zjiQE8IkmboEZIDaG1PlLfswKgv1RVA/is4PdBUrTLd0FPABsgO dqK82qyENVuvsP6XWVZhDhRNSqfVfI6+GmJ001ScxR8AQ5Xq3P4EjvW4eaJKpf8ysYS0rmOjb OF/clbwmE5ZbcWAIxz0kE+PxK8X4cKBgz5fZWkcFKakkdNR9et+kIJpqi2Pyf9FGCnfIJr6YO Zxm9yfA/rqvjpTpGsOe4DBrZzyagGjuiyq+Jcg== Cc: Arnd Bergmann , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , freedreno@lists.freedesktop.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 prototype of msm_rd_dump_submit() has recently changed. However, we have two declarations of this functions, and the other one remains the old version, leading to this: drivers/gpu/drm/msm/msm_gpu.c: In function 'recover_worker': drivers/gpu/drm/msm/msm_gpu.c:295:23: error: passing argument 1 of 'msm_rd_dump_submit' from incompatible pointer type [-Werror=incompatible-pointer-types] This changes the second one to match the first again. Fixes: 2165e2b9cba2 ("drm/msm: split rd debugfs file") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/msm/msm_drv.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index c646843d8822..0a653dd2e618 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -303,7 +303,8 @@ int msm_perf_debugfs_init(struct drm_minor *minor); void msm_perf_debugfs_cleanup(struct msm_drm_private *priv); #else static inline int msm_debugfs_late_init(struct drm_device *dev) { return 0; } -static inline void msm_rd_dump_submit(struct msm_gem_submit *submit) {} +static inline void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit, + const char *fmt, ...) {} static inline void msm_rd_debugfs_cleanup(struct msm_drm_private *priv) {} static inline void msm_perf_debugfs_cleanup(struct msm_drm_private *priv) {} #endif