From patchwork Mon Nov 27 13:51:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 119710 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp295032qgn; Mon, 27 Nov 2017 05:51:53 -0800 (PST) X-Google-Smtp-Source: AGs4zMaF8HMbyi+neV73QWs0z2GulmFt/FnlnvjmqxKY5nncnFCr0x2ceOx6UezdZn5ooG6+kpPt X-Received: by 10.84.139.1 with SMTP id 1mr38960338plq.20.1511790713194; Mon, 27 Nov 2017 05:51:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511790713; cv=none; d=google.com; s=arc-20160816; b=fnjiCzngk3SJkFbdynscJQ3WzehEe1BzRF3YW7gYdkZBBwBfFAFbDjaGJlY2FQESQy zGSGUdjTPludaIUi8HYoVfHuzQ0/xHuFtpwjXFLh90PYYswWGqEmUf8Jukt2NgSlnWPU plSsgDChQx/Vtr8UfA9qvmavYEFjJ9HJN/X5M2ZLJi4ttMqmKUy+pWMDUzK8tdxUUs+W SNhbbsYfo/gTvMLbuqtNk3X0m9Qm/GFy1IfAXuJ/iWGn0xJhRCiviWfEOW0hO/2VasKh 7+3xm0OsKD6JflsewDnmJCEv7bUobunFYngqDHAWPYZz853w2HPQ5qc9WZY2xgewj3ts qpUg== 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=Gx27zR/nwunCZWR+SkPscJhBj8Yl2coNd8Q/VNII1MU=; b=tRKIkrf6fLwfddFQX7sb61829UknQV+TOzX3FW9nJOK8GWGF2u0SYDLW1FmJtw3dXj oPUTnExzmoex9nG3C9M95piyMeR5bcsWDcDyXGta8RMR4jXuAPhx3rgI8rFDKpEp87Ly p6r6yFxVesr1ozEjS8i03qN7OPSJZii2lxWhIYJCQA3B25LCZx9KJ4RbLMDaL7wqZ7Ol Qa2KBPHZ5yOcF0XkHIyMXSN5q4wOfp3Ng84tcRQL6g0NwScSE8tFMjFmv57PNN4EUyvi WIcOs/BU9FAbfeDIlmPFljL2CY/wti1Zzqnljfjn+D22V1RsnCrMwMNp6tURDB8cQU47 wn5A== 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 a33si15069365pla.26.2017.11.27.05.51.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Nov 2017 05:51:53 -0800 (PST) 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 ED0C989B61; Mon, 27 Nov 2017 13:51:50 +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.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9D7DC89B61; Mon, 27 Nov 2017 13:51:49 +0000 (UTC) Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MWiwF-1ee1Sa3NDH-00XpDi; Mon, 27 Nov 2017 14:51:39 +0100 From: Arnd Bergmann To: Rob Clark , David Airlie Subject: [PATCH] drm/msm/rd: fix msm_rd_dump_submit() prototype Date: Mon, 27 Nov 2017 14:51:13 +0100 Message-Id: <20171127135137.3375060-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:+7mNn9L568neE3U+ztoA2ER3GB1gq5xFILLmI0wiU9ul7s8fosH rAzOWWY6KKOANlzSwDidR7mQDOAKPGIUuyE721rSGgHZoJmJx2LD/TJxUSGZ8XvBKIeq98P DhLT0ZmAVG4fmlfNa/TRbSatqy3A1ImK8l6aVaOeTA35dQcq+F2iN/gePD9y7GrDfW87wUG VnuIQACapOIJo1vi1zl8w== X-UI-Out-Filterresults: notjunk:1; V01:K0:o5i8kZPSpsw=:w2rE1L09pPKU/5/7C1UEuN Byb4UP0VfpOAFo9P9vjDV2M8CRDxLMhRHObWIdErxQP8EzuNKAZFWooD4ov6c3iF/sqTVbgCh xpDNXxLcx/KCnlt1ThscOsel1aejYC7rmzjRuYG2r7a8adI18cQsTSTKEEhP6nlAy+xaiuqRN MsXSWsr7jXph70QHxUbeTH0peKGkHAswo7ye5D4btQOYI7IWyAqoBXjg2frWWrRvvaEPrVRIx d3FMGMxjM0KAYJmpn2T5+QLh6EkUfnDD7G5gbkcSttHjBwOsJhaCr2hIUUs9a52RFvgYrnZpE no/6E980CNNm/Xxg5QpVVT1FgzABaDdmRzAv+23yiyAsOpIKmkF9WvejwCprAAAh+rSQRFiYr ZXr9vTJeDM0NSO/rXOvjPRYhw6Gj16tUbi+yjwIb2nBmQBnkL/TsEG4G5MAg8zCO5CQSxpLgt F7L0cvx2g2B77P6mpIFi16oe+byjL3SknRH3B2O5JtfjP43u+a6puZtAPcyomFoC/kyidKZoK X6XLsUyZ6ELoccvw3Xq4Anx9wDj/S7lgDSh2z1xKXy8tu3DyqprFnCpzcRi582LrZQIkoCHPV 6g7KISwvJXkspDy4ofFDpi5mvi9egXtG4eZKKd45Fctu8xH5dcFHsJgLvcUTGk7DFVW/vhE0U +jDqcBTzojEz+qBi6to6VYINGx5y9jkVI9po60C946O9HVvLw3UMWIhJpiS4+4K/v0WrL4ho3 DUxwyXRjrqg+TuRQ7kmqz5qD9EX6hO/hIaiD2w== Cc: Arnd Bergmann , Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Sushmita Susheelendra , linux-arm-msm@vger.kernel.org, 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" A build regression has appeared in linux-4.15-rc from an API change, in configurations without CONFIG_DEBUG_FS: In file included from drivers/gpu/drm/msm/msm_gpu.h:24:0, from drivers/gpu/drm/msm/msm_gpu.c:18: drivers/gpu/drm/msm/msm_drv.h:306:20: note: expected 'struct msm_gem_submit *' but argument is of type 'struct msm_rd_state *' static inline void msm_rd_dump_submit(struct msm_gem_submit *submit) {} ^~~~~~~~~~~~~~~~~~ drivers/gpu/drm/msm/msm_gpu.c:295:4: error: too many arguments to function 'msm_rd_dump_submit' This changes the prototype of the stub function the same way as the regualar prototype. Fixes: 998b9a588314 ("drm/msm/rd: allow adding addition msg to top of dump") 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..9696f796b3c3 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