| Message ID | 20200408191458.1260397-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/msm: fix link error without CONFIG_DEBUG_FS | expand |
On Wed, Apr 8, 2020 at 9:15 PM Arnd Bergmann <arnd@arndb.de> wrote: > I ran into a randconfig link error with debugfs disabled: > > arm-linux-gnueabi-ld: > drivers/gpu/drm/msm/msm_gpu.o: in function `should_dump': msm_gpu.c:(.text+0x1cc): undefined reference to `rd_full' > > Change the helper to only look at this variable if debugfs is present. > > Fixes: e515af8d4a6f ("drm/msm: devcoredump should dump MSM_SUBMIT_BO_DUMP buffers") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> This fixes a compilation error for me on the APQ8060. Tested-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Tue, May 5, 2020 at 10:27 AM Linus Walleij <linus.walleij@linaro.org> wrote: > On Wed, Apr 8, 2020 at 9:15 PM Arnd Bergmann <arnd@arndb.de> wrote: > > > I ran into a randconfig link error with debugfs disabled: > > > > arm-linux-gnueabi-ld: > > drivers/gpu/drm/msm/msm_gpu.o: in function `should_dump': msm_gpu.c:(.text+0x1cc): undefined reference to `rd_full' > > > > Change the helper to only look at this variable if debugfs is present. > > > > Fixes: e515af8d4a6f ("drm/msm: devcoredump should dump MSM_SUBMIT_BO_DUMP buffers") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > This fixes a compilation error for me on the APQ8060. > Tested-by: Linus Walleij <linus.walleij@linaro.org> Could someone be so kind and apply this fix to the MSM DRM tree? Yours, Linus Walleij
On Tue, Jun 9, 2020 at 5:48 AM Linus Walleij <linus.walleij@linaro.org> wrote: > > On Tue, May 5, 2020 at 10:27 AM Linus Walleij <linus.walleij@linaro.org> wrote: > > On Wed, Apr 8, 2020 at 9:15 PM Arnd Bergmann <arnd@arndb.de> wrote: > > > > > I ran into a randconfig link error with debugfs disabled: > > > > > > arm-linux-gnueabi-ld: > > > drivers/gpu/drm/msm/msm_gpu.o: in function `should_dump': msm_gpu.c:(.text+0x1cc): undefined reference to `rd_full' > > > > > > Change the helper to only look at this variable if debugfs is present. > > > > > > Fixes: e515af8d4a6f ("drm/msm: devcoredump should dump MSM_SUBMIT_BO_DUMP buffers") > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > This fixes a compilation error for me on the APQ8060. > > Tested-by: Linus Walleij <linus.walleij@linaro.org> > > Could someone be so kind and apply this fix to the MSM DRM tree? > This should be fixed by 20aebe83698feb107d5a66b6cfd1d54459ccdfcf in msm-next/drm-next, are you still seeing this issue? BR, -R
On Tue, Jun 9, 2020 at 4:04 PM Rob Clark <robdclark@chromium.org> wrote: > On Tue, Jun 9, 2020 at 5:48 AM Linus Walleij <linus.walleij@linaro.org> wrote: > > On Tue, May 5, 2020 at 10:27 AM Linus Walleij <linus.walleij@linaro.org> wrote: > > > On Wed, Apr 8, 2020 at 9:15 PM Arnd Bergmann <arnd@arndb.de> wrote: > > > > > > > I ran into a randconfig link error with debugfs disabled: > > > > > > > > arm-linux-gnueabi-ld: > > > > drivers/gpu/drm/msm/msm_gpu.o: in function `should_dump': msm_gpu.c:(.text+0x1cc): undefined reference to `rd_full' > > > > > > > > Change the helper to only look at this variable if debugfs is present. > > > > > > > > Fixes: e515af8d4a6f ("drm/msm: devcoredump should dump MSM_SUBMIT_BO_DUMP buffers") > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > > > This fixes a compilation error for me on the APQ8060. > > > Tested-by: Linus Walleij <linus.walleij@linaro.org> > > > > Could someone be so kind and apply this fix to the MSM DRM tree? > > > > This should be fixed by 20aebe83698feb107d5a66b6cfd1d54459ccdfcf in > msm-next/drm-next, are you still seeing this issue? Oh nice this works too, I was just rebasing my trees and the patch was still there, of course I didn't see that anothe patch fixed the same issue already. Thanks Rob! Linus Walleij
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 30584eaf8cc8..eb4aeaf291ea 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -167,7 +167,10 @@ static inline bool should_dump(struct msm_gem_submit *submit, int idx) { extern bool rd_full; - return rd_full || (submit->bos[idx].flags & MSM_SUBMIT_BO_DUMP); + if (IS_ENABLED(CONFIG_DEBUG_FS) && rd_full) + return true; + + return submit->bos[idx].flags & MSM_SUBMIT_BO_DUMP; } #endif /* __MSM_GEM_H__ */
I ran into a randconfig link error with debugfs disabled: arm-linux-gnueabi-ld: drivers/gpu/drm/msm/msm_gpu.o: in function `should_dump': msm_gpu.c:(.text+0x1cc): undefined reference to `rd_full' Change the helper to only look at this variable if debugfs is present. Fixes: e515af8d4a6f ("drm/msm: devcoredump should dump MSM_SUBMIT_BO_DUMP buffers") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/gpu/drm/msm/msm_gem.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)