From patchwork Tue Jul 31 20:45:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 143219 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp35599ljj; Tue, 31 Jul 2018 13:45:42 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcUzOEhatR7boBYRSLbvNAeI3UuINUBlSek/a7WsWWUhcaSrL5eawFjLPj6uovQ33NBkOmd X-Received: by 2002:a63:220d:: with SMTP id i13-v6mr22265933pgi.212.1533069942529; Tue, 31 Jul 2018 13:45:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533069942; cv=none; d=google.com; s=arc-20160816; b=aP9Th66fHB23i1pSERi4I0PBWfHjpmGV8uLLGVE7a/cZN1w4hz6fRf5kPmvi+CYI4+ yYFOgibMaNcOlgB6mTOlFp8XeW6Rm+mgmDPFk6jhY3UxzbOfD0NcwMqKPypMs512caBr e/BGev/Tm0le+kChSLzunAWhPl/Pw45m1JTzT0dZFgqgK+ZhHArnl7uIdEYrscQQsPIk 2HW4k1nOla2L/WGcPjFsfSIdV///PFUaCouCuhABB/D/5dZqEYoM7A/Mx+RobYUsoMKg zzvnLtEwvfEH0N6mrh3HnysnUDFWqMssTbFRPpadIY3NBSobKuL5QDocUvTBQNLE1SWm OOwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=fVt+KHFaMkKrIVhIixvFAY6fOaAzPBEijVXOzVZVQWU=; b=0coV95QM5grPYJx5o+9WbbycUFr48MCspiIjRwrxsZYCrH9nyj2JNEt0AfOswZq/Fb R6leQvh0gmPxYN3Xm3xXAlXlKwLoYDzehDMspzS5U4T9EyU/UvqXcMeLvg0AHdzhRrwP BR0JHYsUlcsnXkmrnmTiabTKgFLR3NRwj4LVrm13K+OTV4fb2mwwatwSwvRLgKJyRjfR uSYMTGILe1beUySvMq4PBrvUNBLpMN7tAmilBKtCRKa8NG0NRRDUp2in88YAnWXnCWOY ueAzqGLsUUhmdZpPG+oGKr7uGWY/5CpSHgrRWou4qscQjJbJVyRP5eDcqSs8phvk+uAZ YR/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RcoVTaab; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y63-v6si13597146pgb.5.2018.07.31.13.45.41; Tue, 31 Jul 2018 13:45:42 -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; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RcoVTaab; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726589AbeGaW1q (ORCPT + 13 others); Tue, 31 Jul 2018 18:27:46 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:45525 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727076AbeGaW1p (ORCPT ); Tue, 31 Jul 2018 18:27:45 -0400 Received: by mail-lf1-f67.google.com with SMTP id j143-v6so11724516lfj.12 for ; Tue, 31 Jul 2018 13:45:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uf6qvgC1dItUoa0O5Z6dbVcS0HKi/Z36dkHr+OTOdmY=; b=RcoVTaab9hjWPX0XqdqNtVJA8oiED5uQVsvtbqpzOsfaTTjPjCZxBenveJGYKei4l0 u0wg/d/jJKIoHM6FUsH773SweUSX+nQx4oDLaBwKD3JY5vUuqFOUVN7v8LW1J6cJ90V6 YbKi5tzH25sLUFWxlVBLJm6R5T2l0dvtaBaew= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uf6qvgC1dItUoa0O5Z6dbVcS0HKi/Z36dkHr+OTOdmY=; b=kpRJxLepkyV8Zm3DA9kYVbngEG+BZAokZAXTX9XLmtoeWuHcoXeHgD+/sfWMcuRYVj N7pqdaF+QDFPyW+tRq8Ul1VbEYwZcAt7xFIyfBHCPe7H9Wei2Lp6/23n5TdDUXfUdJzn 9yHRNVVurJFkSkdNs5Rz+r3yCH8plCSLmBn+bwbZauZfWZ0lzUoPY9/4ts0aDZrMs/7x nLwjSZmhWvINpc5ousO6CxLI8qWSBh3dVayw+en6tWs+hQgaCEwmo7r9SIE2F/fhzqzC LKsEGPRWzIhH1AuaVxrc/0OG5Mn+3KL+nBkgznR2jw6/eF6PH5LzABOsI7tBLyRaKvpM fH9Q== X-Gm-Message-State: AOUpUlGHi/PZ7GJUXXVWnGfi70vafAeiLNbORe0nJu6oajRhURCvDa67 fCEOevV1xScHgHfuYBw6+qmkxg== X-Received: by 2002:a19:518a:: with SMTP id g10-v6mr13642625lfl.78.1533069937219; Tue, 31 Jul 2018 13:45:37 -0700 (PDT) Received: from localhost (c-2c3d70d5.07-21-73746f28.bbcust.telenor.se. [213.112.61.44]) by smtp.gmail.com with ESMTPSA id m129-v6sm2081288lfe.50.2018.07.31.13.45.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Jul 2018 13:45:36 -0700 (PDT) From: Anders Roxell To: robdclark@gmail.com, airlied@linux.ie, jcrouse@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Anders Roxell Subject: [PATCH] drm/msm/gpu: fix parameters in function msm_gpu_crashstate_capture Date: Tue, 31 Jul 2018 22:45:32 +0200 Message-Id: <20180731204532.4808-1-anders.roxell@linaro.org> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org When CONFIG_DEV_COREDUMP isn't defined msm_gpu_crashstate_capture doesn't pass the correct parameters. drivers/gpu/drm/msm/msm_gpu.c: In function ‘recover_worker’: drivers/gpu/drm/msm/msm_gpu.c:479: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:388:13: 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:479: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:388:13: note: declared here static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, char *comm, In current code the function msm_gpu_crashstate_capture parameters. Fixes: cdb95931dea3 ("drm/msm/gpu: Add the buffer objects from the submit to the crash dump") Signed-off-by: Anders Roxell --- drivers/gpu/drm/msm/msm_gpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.18.0 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Reviewed-By: Jordan Crouse diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index f388944c93e2..713a92b516ba 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -385,8 +385,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