From patchwork Tue Dec 11 12:09:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharat Masetty X-Patchwork-Id: 10723713 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E452317FE for ; Tue, 11 Dec 2018 12:10:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D353529D37 for ; Tue, 11 Dec 2018 12:10:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C734129D65; Tue, 11 Dec 2018 12:10:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E4C129D37 for ; Tue, 11 Dec 2018 12:10:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726250AbeLKMKB (ORCPT ); Tue, 11 Dec 2018 07:10:01 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:46646 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726114AbeLKMKA (ORCPT ); Tue, 11 Dec 2018 07:10:00 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 6D593606DD; Tue, 11 Dec 2018 12:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1544530200; bh=EOd8JI1CTeyxGLo1+K20G8Hhx1unzfdgE5cHDendwVQ=; h=From:To:Cc:Subject:Date:From; b=mVH/Hn1csh5fatCMBauWXPefKvroRZB6dYiq8LvIt+i5EoajmwEopNe9ewMmGk1S3 bs+VP+X6Wgsoa1v6hLYzCdoUPVisxb3sk6akgui4BKnpE/Dl6LIOL/n68gh0iTDlJ8 OxVpOuElV0LEoKGB7xVOesKXdh66IOUj+tXckHzA= Received: from smasetty-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: smasetty@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 15791601D7; Tue, 11 Dec 2018 12:09:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1544530199; bh=EOd8JI1CTeyxGLo1+K20G8Hhx1unzfdgE5cHDendwVQ=; h=From:To:Cc:Subject:Date:From; b=BbD3QxsWHs2bJ2wEeF/it6cXbYNbK/5tlgzh/rTwbA+UwYijXegv8E26vNd/y2RDm pWSb5nDO5kohVbgZdAMeQ2CXJL6pdrtBJhOjOjx27YS8GHfBcSd3hyOmZEiJmgGO2y bE98MXeCdA6dx5hy4HfkJXC7RsoXOrgTwqpkiSHk= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 15791601D7 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=smasetty@codeaurora.org From: Sharat Masetty To: freedreno@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, jcrouse@codeaurora.org, Sharat Masetty Subject: [PATCH] drm/msm/a5xx: Build a5xx_gpu_state_(get/put) under the right conditionals Date: Tue, 11 Dec 2018 17:39:52 +0530 Message-Id: <1544530192-29893-1-git-send-email-smasetty@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Build the GPU crashstate capture functions only if either of CONFIG_DEBUG_FS, CONFIG_DEV_COREDUMP is defined. Signed-off-by: Sharat Masetty --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index d5f5e56..81014b5 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -1328,6 +1328,7 @@ static void a5xx_gpu_state_get_hlsq_regs(struct msm_gpu *gpu, msm_gem_kernel_put(dumper.bo, gpu->aspace, true); } +#if defined(CONFIG_DEBUG_FS) || defined(CONFIG_DEV_COREDUMP) static struct msm_gpu_state *a5xx_gpu_state_get(struct msm_gpu *gpu) { struct a5xx_gpu_state *a5xx_state = kzalloc(sizeof(*a5xx_state), @@ -1373,8 +1374,6 @@ int a5xx_gpu_state_put(struct msm_gpu_state *state) return kref_put(&state->ref, a5xx_gpu_state_destroy); } - -#if defined(CONFIG_DEBUG_FS) || defined(CONFIG_DEV_COREDUMP) void a5xx_show(struct msm_gpu *gpu, struct msm_gpu_state *state, struct drm_printer *p) { @@ -1456,13 +1455,13 @@ static unsigned long a5xx_gpu_busy(struct msm_gpu *gpu) .destroy = a5xx_destroy, #if defined(CONFIG_DEBUG_FS) || defined(CONFIG_DEV_COREDUMP) .show = a5xx_show, + .gpu_state_get = a5xx_gpu_state_get, + .gpu_state_put = a5xx_gpu_state_put, #endif #if defined(CONFIG_DEBUG_FS) .debugfs_init = a5xx_debugfs_init, #endif .gpu_busy = a5xx_gpu_busy, - .gpu_state_get = a5xx_gpu_state_get, - .gpu_state_put = a5xx_gpu_state_put, }, .get_timestamp = a5xx_get_timestamp, };