lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 857/862] drm/amd/display: Fix build breakage with CONFIG_DEBUG_FS=n
    Date
    From: Nathan Chancellor <nathan@kernel.org>

    commit 2130b87b2273389cafe6765bf09ef564cda01407 upstream.

    After commit 8799c0be89eb ("drm/amd/display: Fix vblank refcount in vrr
    transition"), a build with CONFIG_DEBUG_FS=n is broken due to a
    misplaced brace, along the lines of:

    In file included from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_trace.h:39,
    from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:41:
    drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: At top level:
    ./include/drm/drm_atomic.h:864:9: error: expected identifier or ‘(’ before ‘for’
    864 | for ((__i) = 0; \
    | ^~~
    drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:8317:9: note: in expansion of macro ‘for_each_new_crtc_in_state’
    8317 | for_each_new_crtc_in_state(state, crtc, new_crtc_state, j)
    | ^~~~~~~~~~~~~~~~~~~~~~~~~~

    Move the brace within the #ifdef so that the file can be built with or
    without CONFIG_DEBUG_FS.

    Fixes: 8799c0be89eb ("drm/amd/display: Fix vblank refcount in vrr transition")
    Signed-off-by: Nathan Chancellor <nathan@kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
    +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
    @@ -8329,8 +8329,8 @@ static void amdgpu_dm_atomic_commit_tail
    crtc, dm_new_crtc_state, cur_crc_src))
    DRM_DEBUG_DRIVER("Failed to configure crc source");
    }
    -#endif
    }
    +#endif
    }

    for_each_new_crtc_in_state(state, crtc, new_crtc_state, j)

    \
     
     \ /
      Last update: 2022-10-19 15:39    [W:3.123 / U:0.568 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site