From patchwork Sun Nov 4 13:51:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 150105 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1537289ljp; Sun, 4 Nov 2018 05:52:14 -0800 (PST) X-Google-Smtp-Source: AJdET5d1xqFb7t/3W4EyEmrGXFpAO4G5cKwGxsIqMPRTUEFzwBF360ZQNj7XKwh++RfW4pt9pDrn X-Received: by 2002:a17:902:61:: with SMTP id 88-v6mr18866647pla.189.1541339534247; Sun, 04 Nov 2018 05:52:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541339534; cv=none; d=google.com; s=arc-20160816; b=r2bV6Jwv2jyaTbwzCe8GL4S/UEoAXuVO44/HjoRvEi2titkiDpnIW4c0WFP7gwPqdT qvAlB+FIvat5zIPkX6y7S1pDGBcv9UmZoaIdhm88iaghMd4ps8lkmxZaDAZdOfRjpIfn BP+8/eNFEMfG7jqEEtU0TDpT3uL/6seazUpXqzwkjHnOo24PTaKmQv6HJfvb7j4PREEl szO87T/lszQjD8RNDt+IlapCzty/jOyXmvVL22jx1bmBYGIMbcDnwzDDJRx+29JpZTPS f357+0C8nXt9g/uMpjebWWT2ePH5SJRD80MQkJPQviR4aKBi+JXqYO3iF6w0hq50yuvf AWkg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=knqCbm0uitLwuj/LEkWy19P6gBX2Ww4hOrJbWe74RxU=; b=fLkVwQA0nEh6GHtNmr3GBJjgjKRYjABSafe24PKxiZxtnH1QM17PaIv342GilCcX+e 2Ukou7dYfiiOax212dycaGA3A24GQUM5rmDqY6/Z++eG5J+3m8OHEx8kvwfU0+8AuUmi GdMU0bntmIhNdipc1B3AyF7tKFh9Q7M2IVUiFl6fMJzdf0JJ4GuoiH4/pHM+SmMD9VZq IOPZCHwOW2EYf3mKwLVx/hmdEQHCqbr0wnsz07xvRWDii2PvJt2d27J9403b3fAV57EQ ZOM+yXoEFDcEgLS0O1zyQLREDLfM3toSUhloKghoHvEIejB9Kd8cj5h00wsAODVuQJ+e 20xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Xb9xpIvA; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m6-v6si16732341pls.35.2018.11.04.05.52.13; Sun, 04 Nov 2018 05:52:14 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=default header.b=Xb9xpIvA; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730175AbeKDXHO (ORCPT + 32 others); Sun, 4 Nov 2018 18:07:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:44708 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730094AbeKDXHN (ORCPT ); Sun, 4 Nov 2018 18:07:13 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 568EF20869; Sun, 4 Nov 2018 13:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541339529; bh=zy620Y7x/m+A0bjHOCjHlZZoZhZimtRe0uUNebKIqOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xb9xpIvA7orA5AOzid7WcKVl2c0ADFl29NU4ZQLt3j7OzXT4wGqTgpFk9yAOUIHD1 rj3xmQMa6Mej6ptB324xwXtG5VKfIhNsNKfdGLanzzOV2WPyXFg8gGQPElbgJmTVPL 5Fu6nt4cl4WtAmO4kC+fDAMcWs8wkzmDbsSKEKQ0= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Anders Roxell , Rob Clark , Sasha Levin Subject: [PATCH AUTOSEL 4.19 24/57] drm/msm/gpu: fix parameters in function msm_gpu_crashstate_capture Date: Sun, 4 Nov 2018 08:51:11 -0500 Message-Id: <20181104135144.88324-24-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181104135144.88324-1-sashal@kernel.org> References: <20181104135144.88324-1-sashal@kernel.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Anders Roxell [ Upstream commit 6969019f65b43afb6da6a26f1d9e55bbdfeebcd5 ] 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 Reviewed-By: Jordan Crouse Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/msm_gpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 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