From patchwork Tue Jun 23 19:53:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191612 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1373308ecs; Tue, 23 Jun 2020 14:35:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkPwHrPNaKHKNwr17B7cieW3E5AfVLzwReRZsbUKhXY2JXwpGc5TW7GTmvIpqbi8WUYmVs X-Received: by 2002:a17:906:7fc8:: with SMTP id r8mr13320296ejs.412.1592948134434; Tue, 23 Jun 2020 14:35:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592948134; cv=none; d=google.com; s=arc-20160816; b=RlS+GN3Q8ESbjSM1JNNchVY+BIU81PTQGjE/pB0SGHkYIbeKqer1e0Ae7HEQT3gtKh /YV0c+6jRhoryHLq7eGsJhulzB/S7rdI7C7cG2g6bvCzA7D3lfY7GTxuY9+j+SamoacR 4Yq3oYga60mcb/btTB9jwdK99Ce14T1zGVWsSrhZ+UpjHH8VPLwANq1LGdZui9QUI2m/ fZYfOAwsnDORIghAxlickJllPbbMdQ3qUzI5QHlT0JPc5xT2FcKaKf0yCbj9R7uQ89zK ToPfiv435TD5QYpOseh7HwupaYgVLfokiEZTsm0UGxwaLIhfVMPdt2Vd/mWHit/NRvqa fLyQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nyj02jxGp7JgElcpGCRALR1fCi8E88DzZt2uFTbwb28=; b=g2sL/bDehuwO4dw/Sk33P/K+Y+p509NtQPAhTMUo6yA+IgWqIE0++RJCvNmvkCdJJo YY7ZVkpSbmXrWFPXPyan7sXQCr35MbpaLsQCm/TFkl7MBrHYZZ6J7LdtGatVGx+9X3sY HSk2xnrKtXcPwSgxa8lmrt3jx+3YPMskog+Uus+z3xB7x0VOqE6FZchYK+zJVQtfKk5n 4iV30ZbXUxzXhsIWzQ12Rf+3EWeLqSgBOW77/91LoYi+TNKY6T7vhdauEXGvg0G+x5Va c3oRVhpCFaddbT0SWAGgYhUUKvUMSs3cIXKF3joqonMgkkw6bYoVdp5jvV4lgdsHZKGm 5pLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zPN6H2YC; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lj13si1794571ejb.357.2020.06.23.14.35.34; Tue, 23 Jun 2020 14:35:34 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zPN6H2YC; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393816AbgFWVfc (ORCPT + 15 others); Tue, 23 Jun 2020 17:35:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:51514 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388252AbgFWUKU (ORCPT ); Tue, 23 Jun 2020 16:10:20 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C26B32073E; Tue, 23 Jun 2020 20:10:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943019; bh=JHWuGWGgG+yTFPUz5997dxPk+ppnHwY8nNNDkJLxbRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zPN6H2YCyyPSEAv+l64DgQojT1mE3FsXiFO1fxL/TNYBRo3vucpLuftGtV+MXnnP0 MKbWw2ORhh/+Ze45+0WAHrep27h3KgB6ZcMx3FtxYP9oK4OK+h+gWboqzJem9heBxB ejB9tFhFz3FqvOWDDOOIk7YvWVoPy4tkRsJlhpWM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stephen Rothwell , Bjorn Andersson , Rob Clark , Rob Clark , Sasha Levin Subject: [PATCH 5.7 227/477] drm/msm: Fix undefined "rd_full" link error Date: Tue, 23 Jun 2020 21:53:44 +0200 Message-Id: <20200623195418.310621346@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Andersson [ Upstream commit 20aebe83698feb107d5a66b6cfd1d54459ccdfcf ] rd_full should be defined outside the CONFIG_DEBUG_FS region, in order to be able to link the msm driver even when CONFIG_DEBUG_FS is disabled. Fixes: e515af8d4a6f ("drm/msm: devcoredump should dump MSM_SUBMIT_BO_DUMP buffers") Reported-by: Stephen Rothwell Signed-off-by: Bjorn Andersson Reviewed-by: Rob Clark Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/msm_rd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c index 732f65df5c4f4..fea30e7aa9e83 100644 --- a/drivers/gpu/drm/msm/msm_rd.c +++ b/drivers/gpu/drm/msm/msm_rd.c @@ -29,8 +29,6 @@ * or shader programs (if not emitted inline in cmdstream). */ -#ifdef CONFIG_DEBUG_FS - #include #include #include @@ -47,6 +45,8 @@ bool rd_full = false; MODULE_PARM_DESC(rd_full, "If true, $debugfs/.../rd will snapshot all buffer contents"); module_param_named(rd_full, rd_full, bool, 0600); +#ifdef CONFIG_DEBUG_FS + enum rd_sect_type { RD_NONE, RD_TEST, /* ascii text */