From patchwork Mon Aug 13 21:23:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 144043 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3543647ljj; Mon, 13 Aug 2018 14:24:01 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzX2t+964jnJrz7xFittOPXctclazOvEAQaW8fVlzetNPWopqPJLPTotmnQPbziWu00KyBo X-Received: by 2002:a62:a216:: with SMTP id m22-v6mr20225727pff.163.1534195441746; Mon, 13 Aug 2018 14:24:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534195441; cv=none; d=google.com; s=arc-20160816; b=fQKkq0CIYF9l7NGVszUxmTtCUmRqTrSZ2SpQuFo5BF5Vgp2WwgAOAe6YKbkXqzqjRm WMC7MNBO4K4MMx1/1xkN6dKDA8xK6QxFNXjr4M+FTEzkRsWb3fo8bqKIJdisrqgl26IY Mx7HFGD/W1IrUcGqzL3iLhuo5lvPjxjeap5vKUDgJd3QG4R4SgvLJoZuvF7P+JA6Ixm3 ULROy3lN5BuKXojzrPr7tYuke9/b6LA7bjzQpwaG4+d5kPmoRFolCIovZh7NdSV09gNL OyYx1jn0qx2nBMEUD5t6m43mfThUwpA64fodXHAPqagaG30VIW2prSE5aZxZUNNngUKI JSpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Bc9hjTEw3zN7VNA48G+2rkw989r+tsdi4QdGSI+u5dA=; b=07xPQRHhSoxtWQ5XzEZHl4w12MnPjsVhX+uofSfamcyEznULeom7IzPF+CehntEEAv BennMWo+GIl+cbz6Fd5eFRMB+HM0BvnUx2LCqYsBCemqlp/8glsTIgYvCPMAjJ6DhY8t BZUTm3RJjMolQoItoc/3/OYwxtlI08MsJn35ps9QFjLEU/iodv/B4TI/ZQhf3mRJz0j2 rWZ5/31J09R7XrUCEHI5CZPZ6gSK4pySyuwhDdQIcDsqokk3ciQMiSgV3s1mYGRCitJJ 9hJKRad5uT7IDA8k86RsJH3LYydV5wmUXp8njUf1TeKooklVYQ65ZEQTrDrMoovlPeKO y68A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-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 u11-v6si16670320plm.143.2018.08.13.14.24.01; Mon, 13 Aug 2018 14:24:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729230AbeHNAH6 (ORCPT + 13 others); Mon, 13 Aug 2018 20:07:58 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:34543 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728772AbeHNAH6 (ORCPT ); Mon, 13 Aug 2018 20:07:58 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lm4C9-1gO72H2RH7-00ZeGn; Mon, 13 Aug 2018 23:23:52 +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 1/2] drm/msm/gpu: fix msm_gpu_crashstate_capture stub prototype Date: Mon, 13 Aug 2018 23:23:43 +0200 Message-Id: <20180813212351.2555757-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:aAPMKN6LEn05fLMvFvs3Ego/oMlVt7g/vCqLOyqWT2xQOc9FmGw IuU1/S36zbMj9c2qZacPMilnH2rRjXZqY7FnkcliGXFm5W439wLBP+ecGLKoLTcCSQ+cQne gHLtBVscwMvY4EKUJRtHMasPBWbh7vcmMy2oruCrOvq+R35sSz0DtdB8j19ATm7nims9xmV 6ki7Sw3KC+8Lw8/hl0qug== X-UI-Out-Filterresults: notjunk:1; V01:K0:Wp2a2UUF9e4=:gzv1v6e42YtcuflDzTRraK NR4rDikwqPofO2UaO0YrTM4ll8i0SZmXyc8fdsceVYGeld3CHA8wr5nWp94sur7DBbgFh+D47 l7e+0OIS88a6lAQk28h5DmsrbMFr5T80NexT1Kg/VLpSYJKkLvsGfzfNSWw/1Qnvwd17j+B03 IrqWxEJPRKQXvmvG5UoNumEh8EX+QHp0jYYKIc4kWgxaCy5ekkIpFME2FTGccb1XSAfCv21EE imgqzsKa3b+6uTk+aW4NQPs4b5xRcw6gohrvnNXnqqbAJqPIVuTEQSaLaFDjXIG0PZfoE5Mb5 hIYNWDzn6SmozmHkbe55Vwit9nc+PvIJmr7dQnF4F4N31IUoF/lrGfKTB4h6gC+x8ym/alqd+ 3eYlcR1A3qxHeHaH5Ohj5dmikEI2SwgWqu5JaTsd5bhmYGu9BFyOXyr3QnIrCyeVTYP5cRvrw pOwEZD/dz5Nu8e3CVdnTkWj5WOa8tLWcc3YthXuLv7EQC2yZcU9zJm+aR8pNHZK7eladVjHED FOnk5EevBGxGwRxNFHfhVUwPNSJQbmS+pce+N/U6G1QCiE/62l0M5ThlxNTBUViW/SjE/fNDq I6wyVmYcY47U2n6cdjd+YUDgOqPkRUhV1fByiR94umlvqcvOGv1BrUjOrRD1pn4q3/cJxAcGR 1mOV2AVqEMJMzeMX/Nskt36v8YOVv7G47f2+N8QVgrFN5G+NE9RWHQOjMgb9XuRuuqY4= Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The function prototype recently changed, but the patch missed the second prototype that is used when CONFIG_DEV_COREDUMP is disabled: drivers/gpu/drm/msm/msm_gpu.c: In function 'recover_worker': drivers/gpu/drm/msm/msm_gpu.c:461:34: error: passing argument 2 of 'msm_gpu_crashstate_capture' from incompatible pointer type [-Werror=incompatible-pointer-types] msm_gpu_crashstate_capture(gpu, submit, comm, cmd); ^~~~~~ drivers/gpu/drm/msm/msm_gpu.c:370:67: note: expected 'char *' but argument is of type 'struct msm_gem_submit *' static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, char *comm, ~~~~~~^~~~ drivers/gpu/drm/msm/msm_gpu.c:461:2: error: too many arguments to function 'msm_gpu_crashstate_capture' msm_gpu_crashstate_capture(gpu, submit, comm, cmd); ^~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/msm/msm_gpu.c:370:13: note: declared here static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, char *comm, Change the stub to match the normal function. Fixes: cdb95931dea3 ("drm/msm/gpu: Add the buffer objects from the submit to the crash dump") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/msm/msm_gpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.18.0 diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 5e808cfec345..46e6b82f7b66 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -367,8 +367,8 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, msm_gpu_devcoredump_read, msm_gpu_devcoredump_free); } #else -static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, char *comm, - char *cmd) +static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, + struct msm_gem_submit *submit, char *comm, char *cmd) { } #endif