From patchwork Wed Jun 17 22:36:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 190973 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp861949ilo; Wed, 17 Jun 2020 15:43:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXkFSR7q8Hr7gJCcic0jCfWqdogWiCTd/Sfxruo51VPlcynoMB1hzLozwT57xT1C1+CIB+ X-Received: by 2002:a17:906:fa86:: with SMTP id lt6mr1393604ejb.148.1592433831522; Wed, 17 Jun 2020 15:43:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592433831; cv=none; d=google.com; s=arc-20160816; b=KjBXdqhUIldyMu4gIcZM6g8n9ig5UnkO/oS/1+7gJWAvIl3q+DrJ4GduEN0i/MgCWS rxPhZ8g6X5+8xlB/5NnEfy/ky01InszNtPSClJXVzOahhma6I+sCT8woyhP4rcYRxIS7 VkI9ZQPKvxNnjzreWpPvEZ3C9dPcx/VxQtUuebbel92ACblOhPv56McB3l+NAEu4nYs1 FTofD4U5DJhU2/hcKIC0jCaZsPdu6ntTDM1RCiqBYp3hI6xpPAeMRSEntrhaWqCStxMB 6fppZBgTHouaAiT9z3y6TMT+lCGsCBZ83s6fAcyO8Y28ER81N8Eow4ITcjhe67DAzZbn 2Chw== 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:subject:reply-to:cc:from:to:dkim-signature:date; bh=Hc2vJyKauPxWIN1Brv3xdgm9zv1UUYytsgevWO4nQ68=; b=oLePC12zExjdyMgonhMrGky0Cp3Db7xel3B9nOIRSMKhKWImoh5jw/+pNt3CbHAavy MErh0xdnijrkRppAMFHptoRoVYnUqvuR9BI83SIjtTR8fjr0nywx3qq8xVkeI0A0N+Dg S4Sa1Df5CSQrNCybip5+WhE1SGMSiTFnDJSORaNOuxiSpKYclOOvFF0P0ParWuH3/Mme KKNxJvj8Y3lTXfFXgH7Tsd7XelPFqjVFVp7JLWbThIBsH/JIAHb0YRBQ6F6TniMjvYd4 zHk0DyOVH/dalc9CKo2LP/VxE+op3v0W3dltPtOXsgQZiulpnbHB0bFAPCX1B9j5Pu/g p1gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@protonmail.com header.s=protonmail header.b=BBp2S4pY; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b22si836670edw.120.2020.06.17.15.43.50; Wed, 17 Jun 2020 15:43:51 -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=@protonmail.com header.s=protonmail header.b=BBp2S4pY; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726835AbgFQWnu (ORCPT + 15 others); Wed, 17 Jun 2020 18:43:50 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:25963 "EHLO mail1.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726761AbgFQWnu (ORCPT ); Wed, 17 Jun 2020 18:43:50 -0400 Date: Wed, 17 Jun 2020 22:36:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1592433409; bh=Hc2vJyKauPxWIN1Brv3xdgm9zv1UUYytsgevWO4nQ68=; h=Date:To:From:Cc:Reply-To:Subject:From; b=BBp2S4pYRpuYrTeYQRLzAGBqfLxCAHkntk3pkGwzMAKChzI3s8/AsEi0vavDAxnQq Q+dCgSu4bHOb3f7PuFDpb7YBkDS8CsHvn3USRhUUn+8e3u+1/5A/KsfELIEGy9ZE+F KCMKVMuUtgYtrZR8DHWe76m+pYZA1W6I7o0+/+lw= To: stable@vger.kernel.org From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Cc: Bjorn Andersson , Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse Reply-To: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Subject: [PATCH] drm/msm: Fix undefined "rd_full" link error Message-ID: <20200617223628.3835502-1-nfraprado@protonmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Andersson 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 Signed-off-by: Bjorn Andersson Reviewed-by: Rob Clark Signed-off-by: Rob Clark Signed-off-by: Nícolas F. R. A. Prado --- 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(-) -- 2.27.0 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 #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 */