| Message ID | 20210721175526.22020-8-sean@poorly.run (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/trace: Mirror DRM debug logs to tracefs | expand |
Am Mittwoch, dem 21.07.2021 um 13:55 -0400 schrieb Sean Paul: > From: Sean Paul <seanpaul@chromium.org> > > Since the logs protected by these checks specifically target syslog, > use the new drm_debug_syslog_enabled() call to avoid triggering > these prints when only trace is enabled. > > Signed-off-by: Sean Paul <seanpaul@chromium.org> Acked-by: Lucas Stach <l.stach@pengutronix.de> > Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-8-sean@poorly.run #v5 > > Changes in v5: > -Added to the set > Changes in v6: > -None > --- > drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c > index 76d38561c910..7713474800e8 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c > @@ -353,7 +353,7 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, > > lockdep_assert_held(&gpu->lock); > > - if (drm_debug_enabled(DRM_UT_DRIVER)) > + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) > etnaviv_buffer_dump(gpu, buffer, 0, 0x50); > > link_target = etnaviv_cmdbuf_get_va(cmdbuf, > @@ -509,13 +509,13 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, > etnaviv_cmdbuf_get_va(buffer, &gpu->mmu_context->cmdbuf_mapping) > + buffer->user_size - 4); > > - if (drm_debug_enabled(DRM_UT_DRIVER)) > + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) > pr_info("stream link to 0x%08x @ 0x%08x %p\n", > return_target, > etnaviv_cmdbuf_get_va(cmdbuf, &gpu->mmu_context->cmdbuf_mapping), > cmdbuf->vaddr); > > - if (drm_debug_enabled(DRM_UT_DRIVER)) { > + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) { > print_hex_dump(KERN_INFO, "cmd ", DUMP_PREFIX_OFFSET, 16, 4, > cmdbuf->vaddr, cmdbuf->size, 0); > > @@ -534,6 +534,6 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, > VIV_FE_LINK_HEADER_PREFETCH(link_dwords), > link_target); > > - if (drm_debug_enabled(DRM_UT_DRIVER)) > + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) > etnaviv_buffer_dump(gpu, buffer, 0, 0x50); > }
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c index 76d38561c910..7713474800e8 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c @@ -353,7 +353,7 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, lockdep_assert_held(&gpu->lock); - if (drm_debug_enabled(DRM_UT_DRIVER)) + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) etnaviv_buffer_dump(gpu, buffer, 0, 0x50); link_target = etnaviv_cmdbuf_get_va(cmdbuf, @@ -509,13 +509,13 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, etnaviv_cmdbuf_get_va(buffer, &gpu->mmu_context->cmdbuf_mapping) + buffer->user_size - 4); - if (drm_debug_enabled(DRM_UT_DRIVER)) + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) pr_info("stream link to 0x%08x @ 0x%08x %p\n", return_target, etnaviv_cmdbuf_get_va(cmdbuf, &gpu->mmu_context->cmdbuf_mapping), cmdbuf->vaddr); - if (drm_debug_enabled(DRM_UT_DRIVER)) { + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) { print_hex_dump(KERN_INFO, "cmd ", DUMP_PREFIX_OFFSET, 16, 4, cmdbuf->vaddr, cmdbuf->size, 0); @@ -534,6 +534,6 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, VIV_FE_LINK_HEADER_PREFETCH(link_dwords), link_target); - if (drm_debug_enabled(DRM_UT_DRIVER)) + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) etnaviv_buffer_dump(gpu, buffer, 0, 0x50); }