[PATCH] drm/msm: Fix undefined "rd_full" link error

From: "Nícolas F. R. A. Prado" <nfraprado@protonmail.com>
To: stable@vger.kernel.org
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
	Rob Clark <robdclark@chromium.org>, Sean Paul <sean@poorly.run>,
	David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
	Jordan Crouse <jcrouse@codeaurora.org>
Subject: [PATCH] drm/msm: Fix undefined "rd_full" link error
Date: Wed, 17 Jun 2020 22:36:44 +0000	[thread overview]
Message-ID: <20200617223628.3835502-1-nfraprado@protonmail.com> (raw)

From: Bjorn Andersson <bjorn.andersson@linaro.org>

commit 20aebe83698feb107d5a66b6cfd1d54459ccdfcf upstream.

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 <sfr@canb.auug.org.au>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@protonmail.com>
---
Hi,

this is my first time sending to the stable line, so please tell me if there's
anything wrong.

Building the kernel is failing for the Nexus 5 (ARCH=arm,
CROSS_COMPILE=arm-linux-gnueabihf-, DEFCONFIG=qcom_defconfig) on 5.7 (from
5.7-rc1 to 5.7.3) with the following error:

ERROR: modpost: "rd_full" [drivers/gpu/drm/msm/msm.ko] undefined!
make[1]: *** [scripts/Makefile.modpost:94: __modpost] Error 1
make: *** [Makefile:1326: modules] Error 2

This patch from 5.8-rc1 fixes it, so it should be applied to the 5.7.y branch.

Thanks,
Nícolas

 drivers/gpu/drm/msm/msm_rd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
index 732f65df5c4f..fea30e7aa9e8 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 <linux/circ_buf.h>
 #include <linux/debugfs.h>
 #include <linux/kfifo.h>
@@ -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 */
-- 
2.27.0


