lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 227/477] drm/msm: Fix undefined "rd_full" link error
    Date
    From: Bjorn Andersson <bjorn.andersson@linaro.org>

    [ 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 <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: Sasha Levin <sashal@kernel.org>
    ---
    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 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 <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.25.1


    \
     
     \ /
      Last update: 2020-06-23 23:36    [W:2.382 / U:0.624 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site