drm/trace: Mirror DRM debug logs to tracefs
Subsystems (9)
Sean Paul
reviewerv6 cover drm/trace: Mirror DRM debug logs to tracefs
From: Sean Paul <[email protected]>
Mostly a rebase on drm-tip.
New changes:
- Use the new trace_array_init_printk() call init the global trace buffers.
- Add patch 13 to the set to pipe atomic state logging through trace
v5 is available here:
https://patchwork.freedesktop.org/series/78133/
Sean Paul (14):
drm/mipi_dbi: Convert pr_debug calls to DRM_DEBUG_DRIVER drm/sil164: Convert dev_printk to drm_dev_dbg drm/i915/utils: Replace dev_printk with drm helpers drm/msm/dpu: Replace definitions for dpu debug macros drm/print: rename drm_debug* to be more syslog-centric drm/amd: Gate i2c transaction logs on drm_debug_syslog drm/etnaviv: Change buffer dump checks to target syslog drm/nouveau: Change debug checks to specifically target syslog drm/i915: Change infoframe debug checks to specify syslog drm/print: Add drm_debug_category_printer
drm/mst: Convert debug printers to debug category printers drm/i915: Use debug category printer for welcome message drm/atomic: Use debug category printer for atomic state printer drm/print: Add tracefs support to the drm logging helpers
Documentation/gpu/drm-uapi.rst | 6 + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 4 +- drivers/gpu/drm/drm_atomic.c | 5 +- drivers/gpu/drm/drm_atomic_uapi.c | 2 +- drivers/gpu/drm/drm_crtc_internal.h | 3 +- drivers/gpu/drm/drm_dp_mst_topology.c | 9 +- drivers/gpu/drm/drm_drv.c | 3 + drivers/gpu/drm/drm_mipi_dbi.c | 8 +- drivers/gpu/drm/drm_print.c | 235 ++++++++++++++++--- drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 8 +- drivers/gpu/drm/i2c/sil164_drv.c | 12 +- drivers/gpu/drm/i915/display/intel_display.c | 4 +- drivers/gpu/drm/i915/i915_drv.c | 3 +- drivers/gpu/drm/i915/i915_utils.c | 5 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 20 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 4 +- include/drm/drm_print.h | 96 +++++++- 17 files changed, 329 insertions(+), 98 deletions(-)
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 1/14 drm/mipi_dbi: Convert pr_debug calls to DRM_DEBUG_DRIVER
From: Sean Paul <[email protected]>
Use the drm logging helpers to output these messages to ensure they'll be included by the drm tracefs instance.
Changes in v5:
-Added to the set
Changes in v6:
-None
--- drivers/gpu/drm/drm_mipi_dbi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/drm_mipi_dbi.c +2 -6
@@ -764,9 +764,7 @@ static int mipi_dbi_spi1e_transfer(struct mipi_dbi *dbi, int dc,int i, ret;u8 *dst; -if (drm_debug_enabled (DRM_UT_DRIVER )) -pr_debug ("[drm:%s] dc=%d, max_chunk=%zu, transfers:\n" , - __func__, dc, max_chunk); +DRM_DEBUG_DRIVER ("dc=%d, max_chunk=%zu, transfers:\n" , dc, max_chunk); tr.speed_hz =mipi_dbi_spi_cmd_max_speed (spi, len);spi_message_init_with_transfers (&m, &tr,1 );
@@ -888,9 +886,7 @@ static int mipi_dbi_spi1_transfer(struct mipi_dbi *dbi, int dc, max_chunk = dbi->tx_buf9_len; dst16 = dbi->tx_buf9; -if (drm_debug_enabled (DRM_UT_DRIVER )) -pr_debug ("[drm:%s] dc=%d, max_chunk=%zu, transfers:\n" , - __func__, dc, max_chunk); +DRM_DEBUG_DRIVER ("dc=%d, max_chunk=%zu, transfers:\n" , dc, max_chunk); max_chunk =min (max_chunk /2 , len);
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 2/14 drm/sil164: Convert dev_printk to drm_dev_dbg
In reply to Sean PaulFrom: Sean Paul <[email protected]>
Use the drm debug helper instead of dev_printk in order to leverage the upcoming tracefs support
Changes in v5:
-Added to the set
Changes in v6:
-None
--- drivers/gpu/drm/i2c/sil164_drv.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/i2c/sil164_drv.c +4 -8
@@ -43,11 +43,6 @@ struct sil164_priv {#define to_sil164_priv (x) \ ((struct sil164_priv *)to_encoder_slave(x)->slave_priv) -#define sil164_dbg (client, format, ...) do { \ - if (drm_debug_enabled(DRM_UT_KMS)) \ - dev_printk(KERN_DEBUG, &client->dev, \ - "%s: " format, __func__, ## __VA_ARGS__); \ - } while (0)#define sil164_info (client, format, ...) \ dev_info(&client->dev, format, __VA_ARGS__)#define sil164_err (client, format, ...) \
@@ -359,8 +354,8 @@ sil164_probe(struct i2c_client *client, const struct i2c_device_id *id)int rev =sil164_read (client,SIL164_REVISION );if (vendor !=0x1 || device !=0x6 ) { -sil164_dbg (client,"Unknown device %x:%x.%x\n" , - vendor, device, rev); +drm_dev_dbg (&client->dev,DRM_UT_KMS , +"Unknown device %x:%x.%x\n" , vendor, device, rev);return -ENODEV ; }
@@ -389,7 +384,8 @@ sil164_detect_slave(struct i2c_client *client) };if (i2c_transfer (adap, &msg,1 ) !=1 ) { -sil164_dbg (adap,"No dual-link slave found." ); +drm_dev_dbg (&adap->dev,DRM_UT_KMS , +"No dual-link slave found." );return NULL ; }
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 3/14 drm/i915/utils: Replace dev_printk with drm helpers
In reply to Sean PaulFrom: Sean Paul <[email protected]>
Use drm logging helpers to add support for the upcoming tracefs implementation.
Changes in v5:
-Added to the set
Changes in v6:
-None
--- drivers/gpu/drm/i915/i915_utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_utils.c +2 -3
@@ -30,10 +30,9 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, vaf.va = &args;if (is_error) -dev_printk (level, kdev,"%pV" , &vaf); +drm_dev_printk (kdev, level,"%pV" , &vaf);else -dev_printk (level, kdev,"[" DRM_NAME ":%ps] %pV" , -__builtin_return_address (0 ), &vaf); +drm_err (&dev_priv->drm,"%pV" , &vaf);va_end (args);
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 4/14 drm/msm/dpu: Replace definitions for dpu debug macros
In reply to Sean PaulFrom: Sean Paul <[email protected]>
The debug messages shouldn't be logged as errors when debug categories are enabled. Use the drm logging helpers to do the right thing
Changes in v5:
-Added to the set
Changes in v6:
-None
--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +4 -16
@@ -29,27 +29,15 @@* DPU_DEBUG - macro for kms/plane/crtc/encoder/connector logs * @fmt: Pointer to format string */ -#define DPU_DEBUG (fmt, ...) \ - do { \ - if (drm_debug_enabled(DRM_UT_KMS)) \ - DRM_DEBUG(fmt, ##__VA_ARGS__); \ - else \ - pr_debug(fmt, ##__VA_ARGS__); \ - } while (0) +#define DPU_DEBUG (fmt, ...) DRM_DEBUG_KMS(fmt, ##__VA_ARGS__)/** * DPU_DEBUG_DRIVER - macro for hardware driver logging * @fmt: Pointer to format string */ -#define DPU_DEBUG_DRIVER (fmt, ...) \ - do { \ - if (drm_debug_enabled(DRM_UT_DRIVER)) \ - DRM_ERROR(fmt, ##__VA_ARGS__); \ - else \ - pr_debug(fmt, ##__VA_ARGS__); \ - } while (0) - -#define DPU_ERROR (fmt, ...) pr_err("[dpu error]" fmt, ##__VA_ARGS__) +#define DPU_DEBUG_DRIVER (fmt, ...) DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__) + +#define DPU_ERROR (fmt, ...) DRM_ERROR(fmt, ##__VA_ARGS__)/** * ktime_compare_safe - compare two ktime structures
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 5/14 drm/print: rename drm_debug* to be more syslog-centric
In reply to Sean PaulFrom: Sean Paul <[email protected]>
In preparation for tracefs support, rename drm_debug related functions to reflect that it targets the syslog. This will allow us to selectively target syslog and/or tracefs.
No functional changes here.
Changes in v5:
-Added to the set
Changes in v6:
-None
--- drivers/gpu/drm/drm_print.c | 12 ++++++------ include/drm/drm_print.h | 13 +++++++++---- 2 files changed, 15 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_print.c +6 -6
@@ -37,11 +37,11 @@#include <drm/drm_print.h> /* -* __drm_debug: Enable debug output. +* __drm_debug_syslog: Enable debug output to system logs * Bitmask of DRM_UT_x. See include/drm/drm_print.h for details. */ -unsigned int __drm_debug; -EXPORT_SYMBOL (__drm_debug); +unsigned int __drm_debug_syslog; +EXPORT_SYMBOL (__drm_debug_syslog);MODULE_PARM_DESC (debug,"Enable debug output, where each bit enables a debug category.\n" "\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n"
@@ -52,7 +52,7 @@ MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug cat"\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n" "\t\tBit 7 (0x80) will enable LEASE messages (leasing code)\n" "\t\tBit 8 (0x100) will enable DP messages (displayport code)"); -module_param_named (debug, __drm_debug, int,0600 ); +module_param_named (debug, __drm_debug_syslog, int,0600 );void __drm_puts_coredump (struct drm_printer *p,const char *str) {
@@ -160,11 +160,11 @@ void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf) }EXPORT_SYMBOL (__drm_printfn_info); -void __drm_printfn_debug (struct drm_printer *p,struct va_format *vaf) +void __drm_printfn_debug_syslog (struct drm_printer *p,struct va_format *vaf) {pr_debug ("%s %pV" , p->prefix, vaf); } -EXPORT_SYMBOL (__drm_printfn_debug); +EXPORT_SYMBOL (__drm_printfn_debug_syslog);void __drm_printfn_err (struct drm_printer *p,struct va_format *vaf) {
include/drm/drm_print.h +9 -4
@@ -35,7 +35,7 @@#include <drm/drm.h> /* Do *not* use outside of drm_print.[ch]! */ -extern unsigned int __drm_debug; +extern unsigned int __drm_debug_syslog;/** * DOC: print
@@ -85,7 +85,7 @@ void __drm_puts_coredump(struct drm_printer *p, const char *str);void __drm_printfn_seq_file (struct drm_printer *p,struct va_format *vaf);void __drm_puts_seq_file (struct drm_printer *p,const char *str);void __drm_printfn_info (struct drm_printer *p,struct va_format *vaf); -void __drm_printfn_debug (struct drm_printer *p,struct va_format *vaf); +void __drm_printfn_debug_syslog (struct drm_printer *p,struct va_format *vaf);void __drm_printfn_err (struct drm_printer *p,struct va_format *vaf);__printf (2 ,3 )
@@ -227,7 +227,7 @@ static inline struct drm_printer drm_info_printer(struct device *dev)static inline struct drm_printer drm_debug_printer (const char *prefix) {struct drm_printer p = { - .printfn = __drm_printfn_debug, + .printfn = __drm_printfn_debug_syslog, .prefix = prefix };return p;
@@ -319,9 +319,14 @@ enum drm_debug_category { DRM_UT_DRMRES = 0x200, }; +static inline bool drm_debug_syslog_enabled (enum drm_debug_category category) +{ +return unlikely (__drm_debug_syslog & category); +} +static inline bool drm_debug_enabled (enum drm_debug_category category) { -return unlikely (__drm_debug & category); +return drm_debug_syslog_enabled (category); }/*
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 6/14 drm/amd: Gate i2c transaction logs on drm_debug_syslog
In reply to Sean PaulFrom: Sean Paul <[email protected]>
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.
Changes in v5:
-Added to the set
Changes in v6:
-None
--- drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c +2 -2
@@ -232,7 +232,7 @@ static uint32_t smu_v11_0_i2c_transmit(struct i2c_adapter *control,DRM_DEBUG_DRIVER ("I2C_Transmit(), address = %x, bytes = %d , data: " , (uint16_t )address, numbytes); -if (drm_debug_enabled (DRM_UT_DRIVER )) { +if (drm_debug_syslog_enabled (DRM_UT_DRIVER )) {print_hex_dump (KERN_INFO ,"data: " ,DUMP_PREFIX_NONE ,16 ,1 , data, numbytes, false); }
@@ -386,7 +386,7 @@ static uint32_t smu_v11_0_i2c_receive(struct i2c_adapter *control,DRM_DEBUG_DRIVER ("I2C_Receive(), address = %x, bytes = %d, data :" , (uint16_t )address, bytes_received); -if (drm_debug_enabled (DRM_UT_DRIVER )) { +if (drm_debug_syslog_enabled (DRM_UT_DRIVER )) {print_hex_dump (KERN_INFO ,"data: " ,DUMP_PREFIX_NONE ,16 ,1 , data, bytes_received, false); }
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 7/14 drm/etnaviv: Change buffer dump checks to target syslog
In reply to Sean PaulFrom: Sean Paul <[email protected]>
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.
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(-)
drivers/gpu/drm/etnaviv/etnaviv_buffer.c +4 -4
@@ -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 ); }
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 8/14 drm/nouveau: Change debug checks to specifically target syslog
In reply to Sean PaulFrom: Sean Paul <[email protected]>
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.
Changes in v5:
-Added to the set
Changes in v6:
-Rebased on drm-tip, changes in dispnv50/disp.h were rebased out
--- drivers/gpu/drm/nouveau/nouveau_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_drv.h +2 -2
@@ -258,11 +258,11 @@ void nouveau_drm_device_remove(struct drm_device *dev); #define NV_INFO(drm,f,a...) NV_PRINTK(info, &(drm)->client, f, ##a) #define NV_DEBUG(drm,f,a...) do { \ - if (drm_debug_enabled(DRM_UT_DRIVER)) \ + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) \ NV_PRINTK(info, &(drm)->client, f, ##a); \ } while(0) #define NV_ATOMIC(drm,f,a...) do { \ - if (drm_debug_enabled(DRM_UT_ATOMIC)) \ + if (drm_debug_syslog_enabled(DRM_UT_ATOMIC)) \ NV_PRINTK(info, &(drm)->client, f, ##a); \ } while(0)
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 9/14 drm/i915: Change infoframe debug checks to specify syslog
In reply to Sean PaulFrom: Sean Paul <[email protected]>
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.
Changes in v5:
-Added to the set
Changes in v6:
-None
--- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +2 -2
@@ -12908,7 +12908,7 @@ static void intel_dump_infoframe(struct drm_i915_private *dev_priv, const union hdmi_infoframe *frame) { -if (!drm_debug_enabled (DRM_UT_KMS )) +if (!drm_debug_syslog_enabled (DRM_UT_KMS ))return ;hdmi_infoframe_log (KERN_DEBUG , dev_priv->drm.dev, frame);
@@ -13551,7 +13551,7 @@ pipe_config_infoframe_mismatch(struct drm_i915_private *dev_priv, const union hdmi_infoframe *b) {if (fastset) { -if (!drm_debug_enabled (DRM_UT_KMS )) +if (!drm_debug_syslog_enabled (DRM_UT_KMS ))return ; drm_dbg_kms(&dev_priv->drm,
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 10/14 drm/print: Add drm_debug_category_printer
In reply to Sean PaulFrom: Sean Paul <[email protected]>
This patch adds a new printer which will select the appropriate output for a given debug category. Currently there is only one output target, which is syslog. However in the future we'll have tracefs and it will be useful to print to syslog, tracefs, or both. Drivers just need to create the printer for the appropriate category and the printer will decide where to send the output.
Changes in v5:
-Added to the set
Changes in v6:
-None
--- drivers/gpu/drm/drm_print.c | 5 +++++ include/drm/drm_print.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)
drivers/gpu/drm/drm_print.c +5 -0
@@ -172,6 +172,11 @@ void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf) }EXPORT_SYMBOL (__drm_printfn_err); +void __drm_printfn_noop (struct drm_printer *p,struct va_format *vaf) +{ +} +EXPORT_SYMBOL (__drm_printfn_noop); +/** * drm_puts - print a const string to a &drm_printer stream * @p: the &drm printer
include/drm/drm_print.h +28 -0
@@ -87,6 +87,7 @@ void __drm_puts_seq_file(struct drm_printer *p, const char *str);void __drm_printfn_info (struct drm_printer *p,struct va_format *vaf);void __drm_printfn_debug_syslog (struct drm_printer *p,struct va_format *vaf);void __drm_printfn_err (struct drm_printer *p,struct va_format *vaf); +void __drm_printfn_noop (struct drm_printer *p,struct va_format *vaf); __printf(2, 3)void drm_printf (struct drm_printer *p,const char *f, ...);
@@ -329,6 +330,33 @@ static inline bool drm_debug_enabled(enum drm_debug_category category)return drm_debug_syslog_enabled (category); } +/** +* drm_debug_category_printer - construct a &drm_printer that outputs to +* pr_debug() if enabled for the given category. +* @category: the DRM_UT_* message category this message belongs to +* @prefix: trace output prefix +* +* RETURNS: +* The &drm_printer object +*/ +static inline struct drm_printer +drm_debug_category_printer (enum drm_debug_category category, +const char *prefix) +{ +struct drm_printer p = { + .prefix = prefix + }; + +if (drm_debug_syslog_enabled (category)) { + p.printfn = __drm_printfn_debug_syslog; + }else { +WARN (1 ,"Debug category %d is inactive." , category); + p.printfn = __drm_printfn_noop; + } + +return p; +} +/* * struct device based logging *
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 11/14 drm/mst: Convert debug printers to debug category printers
In reply to Sean PaulFrom: Sean Paul <[email protected]>
The printers in dp_mst are meant to be gated on DRM_UT_DP, so use the debug category printer to avoid dumping mst transactions to the wrong place.
Changes in v5:
-Added to the set
Changes in v6:
-None
--- drivers/gpu/drm/drm_dp_mst_topology.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +6 -3
@@ -1242,7 +1242,8 @@ static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb, } out:if (unlikely (ret == -EIO ) &&drm_debug_enabled (DRM_UT_DP )) { -struct drm_printer p =drm_debug_printer (DBG_PREFIX ); +struct drm_printer p =drm_debug_category_printer (DRM_UT_DP , +DBG_PREFIX );drm_dp_mst_dump_sideband_msg_tx (&p, txmsg); }
@@ -2781,7 +2782,8 @@ static int process_single_tx_qlock(struct drm_dp_mst_topology_mgr *mgr, ret =drm_dp_send_sideband_msg (mgr, up, chunk, idx);if (unlikely (ret) &&drm_debug_enabled (DRM_UT_DP )) { -struct drm_printer p =drm_debug_printer (DBG_PREFIX ); +struct drm_printer p =drm_debug_category_printer (DRM_UT_DP , +DBG_PREFIX );drm_printf (&p,"sideband msg failed to send\n" );drm_dp_mst_dump_sideband_msg_tx (&p, txmsg);
@@ -2825,7 +2827,8 @@ static void drm_dp_queue_down_tx(struct drm_dp_mst_topology_mgr *mgr,list_add_tail (&txmsg->next, &mgr->tx_msg_downq);if (drm_debug_enabled (DRM_UT_DP )) { -struct drm_printer p =drm_debug_printer (DBG_PREFIX ); +struct drm_printer p =drm_debug_category_printer (DRM_UT_DP , +DBG_PREFIX );drm_dp_mst_dump_sideband_msg_tx (&p, txmsg); }
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v6 11/14] drm/mst: Convert debug printers to debug category printers
Quoted 57 lines · Sean Paul
From: Sean Paul <[email protected]>
The printers in
dp_mstare meant to be gated onDRM_UT_DP, so use the debug category printer to avoid dumping mst transactions to the wrong place.Signed-off-by Sean Paul <[email protected]>Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v5Changes in v5:
-Added to the set
Changes in v6:(quoted diff) +0
-2-None --- drivers/gpu/drm/drm_dp_mst_topology.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_dp_mst_topology.c +2
-1@@ -1242,7 +1242,8 @@ static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb, } out:if (unlikely (ret == -EIO ) &&drm_debug_enabled (DRM_UT_DP )) { -struct drm_printer p =drm_debug_printer (DBG_PREFIX ); +struct drm_printer p =drm_debug_category_printer (DRM_UT_DP , +DBG_PREFIX );drm_dp_mst_dump_sideband_msg_tx (&p, txmsg);drivers/gpu/drm/drm_dp_mst_topology.c +2
-1}@@ -2781,7 +2782,8 @@ static int process_single_tx_qlock(structdrm_dp_mst_topology_mgr *mgr, ret =drm_dp_send_sideband_msg (mgr, up, chunk, idx);if (unlikely (ret) &&drm_debug_enabled (DRM_UT_DP )) { -struct drm_printer p =drm_debug_printer (DBG_PREFIX ); +struct drm_printer p =drm_debug_category_printer (DRM_UT_DP , +DBG_PREFIX );drm_printf (&p,"sideband msg failed to send\n" );drivers/gpu/drm/drm_dp_mst_topology.c +2
-1drm_dp_mst_dump_sideband_msg_tx (&p, txmsg);@@ -2825,7 +2827,8 @@ static void drm_dp_queue_down_tx(struct drm_dp_mst_topology_mgr *mgr,list_add_tail (&txmsg->next, &mgr->tx_msg_downq);if (drm_debug_enabled (DRM_UT_DP )) { -struct drm_printer p =drm_debug_printer (DBG_PREFIX ); +struct drm_printer p =drm_debug_category_printer (DRM_UT_DP , +DBG_PREFIX );drm_dp_mst_dump_sideband_msg_tx (&p, txmsg);}
Signature · 8 lines
Sincerely,
Lyude Paul (she/her)
Software Engineer at Red Hat
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-develSean Paul
reviewerPATCH v6 12/14 drm/i915: Use debug category printer for welcome message
In reply to Sean PaulFrom: Sean Paul <[email protected]>
The welcome printer is meant to be gated on DRM_UT_DRIVER, so use the debug category printer to avoid dumping the message in the wrong place.
Changes in v5:
-Added to the set
Changes in v6:
-None
--- drivers/gpu/drm/i915/i915_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +2 -1
@@ -872,7 +872,8 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)static void i915_welcome_messages (struct drm_i915_private *dev_priv) {if (drm_debug_enabled (DRM_UT_DRIVER )) { -struct drm_printer p =drm_debug_printer ("i915 device info:" ); +struct drm_printer p =drm_debug_category_printer (DRM_UT_DRIVER , +"i915 device info:" ); drm_printf(&p, "pciid=0x%04x rev=0x%02x platform=%s (subplatform=0x%x) gen=%i\n", INTEL_DEVID(dev_priv),
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 13/14 drm/atomic: Use debug category printer for atomic state printer
In reply to Sean PaulFrom: Sean Paul <[email protected]>
The atomic state is printed if the DRM_UT_STATE is active, but it's printed at INFO level. This patch converts it to use the debug category printer so:
a- it's consistent with other DRM_UT_STATE logging b- it's properly routed through drm_trace when introduced
Changes in v6:
-Added to the set
--- drivers/gpu/drm/drm_atomic.c | 5 +++-- drivers/gpu/drm/drm_atomic_uapi.c | 2 +- drivers/gpu/drm/drm_crtc_internal.h | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_atomic.c +3 -2
@@ -1543,9 +1543,10 @@ int __drm_atomic_helper_set_config(struct drm_mode_set *set, }EXPORT_SYMBOL (__drm_atomic_helper_set_config); -void drm_atomic_print_state (const struct drm_atomic_state *state) +void drm_atomic_print_state (const struct drm_atomic_state *state, +const char *prefix) { -struct drm_printer p =drm_info_printer (state->dev->dev); +struct drm_printer p =drm_debug_category_printer (DRM_UT_STATE , prefix);struct drm_plane *plane;struct drm_plane_state *plane_state;struct drm_crtc *crtc;
drivers/gpu/drm/drm_atomic_uapi.c +1 -1
@@ -1413,7 +1413,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, ret =drm_atomic_nonblocking_commit (state); }else {if (drm_debug_enabled (DRM_UT_STATE )) -drm_atomic_print_state (state); +drm_atomic_print_state (state,"commit_state" ); ret =drm_atomic_commit (state); }
drivers/gpu/drm/drm_crtc_internal.h +2 -1
@@ -233,7 +233,8 @@ int __drm_atomic_helper_disable_plane(struct drm_plane *plane,int __drm_atomic_helper_set_config (struct drm_mode_set *set,struct drm_atomic_state *state); -void drm_atomic_print_state (const struct drm_atomic_state *state); +void drm_atomic_print_state (const struct drm_atomic_state *state, +const char *prefix);/* drm_atomic_uapi.c */ int drm_atomic_connector_commit_dpms(struct drm_atomic_state *state,
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerPATCH v6 14/14 drm/print: Add tracefs support to the drm logging helpers
In reply to Sean PaulFrom: Sean Paul <[email protected]>
This patch adds a new module parameter called drm.trace which accepts the same mask as drm.debug. When a debug category is enabled, log messages will be put in a new tracefs instance called drm for consumption.
Using the new tracefs instance will allow distros to enable drm logging in production without impacting performance or spamming the system logs.
Changes in v5:
-Re-write to use trace_array and the tracefs instance support Changes in v6:
-Use the new trace_array_init_printk() to initialize global trace
buffers
--- Documentation/gpu/drm-uapi.rst | 6 + drivers/gpu/drm/drm_drv.c | 3 + drivers/gpu/drm/drm_print.c | 216 ++++++++++++++++++++++++++++----- include/drm/drm_print.h | 63 ++++++++-- 4 files changed, 248 insertions(+), 40 deletions(-)
Documentation/gpu/drm-uapi.rst +6 -0
@@ -424,6 +424,12 @@ Debugfs Support .. kernel-doc:: drivers/gpu/drm/drm_debugfs.c :export: +DRM Tracing +--------------- + +.. kernel-doc:: drivers/gpu/drm/drm_print.c + :doc: DRM Tracing + Sysfs Support =============
drivers/gpu/drm/drm_drv.c +3 -0
@@ -1107,12 +1107,15 @@ static void drm_core_exit(void)drm_sysfs_destroy ();idr_destroy (&drm_minors_idr);drm_connector_ida_destroy (); +drm_trace_cleanup (); }static int __init drm_core_init (void ) {int ret; +drm_trace_init (); +drm_connector_ida_init ();idr_init (&drm_minors_idr);
drivers/gpu/drm/drm_print.c +187 -29
264 lines not on this page · raw message
include/drm/drm_print.h +52 -11
136 lines not on this page · raw message
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
kernel test robot
build botRe: [PATCH v6 14/14] drm/print: Add tracefs support to the drm logging helpers
I love your patch! Perhaps something to improve:
Hi Sean,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on tegra-drm/drm/tegra/for-next drm-tip/drm-tip linus/master drm-exynos/exynos-drm-next v5.9-rc1 next-20200818] [cannot apply to drm/drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Sean-Paul/drm-trace-Mirror-DRM-debug-logs-to-tracefs/20200819-050745 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: openrisc-randconfig-s031-20200818 (attached as .config) compiler: or1k-linux-gcc (GCC) 9.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.2-183-gaa6ede3b-dirty
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=openrisc
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/drm_print.c:459:21: sparse: sparse: non-ANSI function declaration of function 'drm_trace_init' >> drivers/gpu/drm/drm_print.c:498:24: sparse: sparse: non-ANSI function declaration of function 'drm_trace_cleanup'
drivers/gpu/drm/drm_print.c:467:15: sparse: sparse: undefined identifier 'trace_array_init_printk' drivers/gpu/drm/drm_print.c: note: in included file (through arch/openrisc/include/asm/io.h, include/linux/io.h):
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32 include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32 include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32 include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32 include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32 include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
# https://github.com/0day-ci/linux/commit/fe0a955028a2121ce9ab9acd1c2ab74d219cdc60
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Sean-Paul/drm-trace-Mirror-DRM-debug-logs-to-tracefs/20200819-050745 git checkout fe0a955028a2121ce9ab9acd1c2ab74d219cdc60
vim +/drm_trace_init +459 drivers/gpu/drm/drm_print.c
452
453 /**
454 * drm_trace_init - initializes the drm trace array
455 *
456 * This function fetches (or creates) the drm trace array. This should be called
457 * once on drm subsystem creation and matched with drm_trace_cleanup().
458 */
> 459 void drm_trace_init()
460 {
461 int ret;
462
463 trace_arr = trace_array_get_by_name("drm");
464 if (!trace_arr)
465 return;
466
467 ret = trace_array_init_printk(trace_arr);
468 if (ret)
469 drm_trace_cleanup();
470 }
471 EXPORT_SYMBOL(drm_trace_init);
472
473 /**
474 * drm_trace_printf - adds an entry to the drm tracefs instance
475 * @format: printf format of the message to add to the trace
476 *
477 * This function adds a new entry in the drm tracefs instance
478 */
479 void drm_trace_printf(const char *format, ...)
480 {
481 struct va_format vaf;
482 va_list args;
483
484 va_start(args, format);
485 vaf.fmt = format;
486 vaf.va = &args;
487 trace_array_printk(trace_arr, _THIS_IP_, "%pV", &vaf);
488 va_end(args);
489 }
490
491 /**
492 * drm_trace_cleanup - destroys the drm trace array
493 *
494 * This function destroys the drm trace array created with drm_trace_init. This
495 * should be called once on drm subsystem close and matched with
496 * drm_trace_init().
497 */
> 498 void drm_trace_cleanup()---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Sean Paul
reviewerPATCH v6 14/14 drm/print: Add tracefs support to the drm logging helpers
In reply to Sean PaulFrom: Sean Paul <[email protected]>
This patch adds a new module parameter called drm.trace which accepts the same mask as drm.debug. When a debug category is enabled, log messages will be put in a new tracefs instance called drm for consumption.
Using the new tracefs instance will allow distros to enable drm logging in production without impacting performance or spamming the system logs.
Changes in v5:
-Re-write to use trace_array and the tracefs instance support Changes in v6:
-Use the new trace_array_init_printk() to initialize global trace
buffers
Changes in v6.5:
-Fix kernel test robot warning
-Add a trace printf in __drm_err
--- Documentation/gpu/drm-uapi.rst | 6 + drivers/gpu/drm/drm_drv.c | 3 + drivers/gpu/drm/drm_print.c | 223 ++++++++++++++++++++++++++++----- include/drm/drm_print.h | 63 ++++++++-- 4 files changed, 255 insertions(+), 40 deletions(-)
Documentation/gpu/drm-uapi.rst +6 -0
@@ -424,6 +424,12 @@ Debugfs Support .. kernel-doc:: drivers/gpu/drm/drm_debugfs.c :export: +DRM Tracing +--------------- + +.. kernel-doc:: drivers/gpu/drm/drm_print.c + :doc: DRM Tracing + Sysfs Support =============
drivers/gpu/drm/drm_drv.c +3 -0
@@ -1107,12 +1107,15 @@ static void drm_core_exit(void)drm_sysfs_destroy ();idr_destroy (&drm_minors_idr);drm_connector_ida_destroy (); +drm_trace_cleanup (); }static int __init drm_core_init (void ) {int ret; +drm_trace_init (); +drm_connector_ida_init ();idr_init (&drm_minors_idr);
drivers/gpu/drm/drm_print.c +194 -29
277 lines not on this page · raw message
include/drm/drm_print.h +52 -11
136 lines not on this page · raw message
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
reviewerFriendly ping, does anyone care to review/comment?
Quoted 47 lines · Sean Paul
From: Sean Paul <[email protected]>
Mostly a rebase on drm-tip.
New changes:
- Use the newtrace_array_init_printk()call init the global trace buffers.
- Add patch 13 to the set to pipe atomic state logging through tracev5 is available here:
https://patchwork.freedesktop.org/series/78133/Sean Paul (14):
drm/mipi_dbi: Convertpr_debugcalls toDRM_DEBUG_DRIVERdrm/sil164: Convertdev_printktodrm_dev_dbgdrm/i915/utils: Replacedev_printkwith drm helpers drm/msm/dpu: Replace definitions for dpu debug macros drm/print: rename drm_debug* to be more syslog-centric drm/amd: Gate i2c transaction logs ondrm_debug_syslogdrm/etnaviv: Change buffer dump checks to target syslog drm/nouveau: Change debug checks to specifically target syslog drm/i915: Change infoframe debug checks to specify syslog drm/print: Adddrm_debug_category_printer
drm/mst: Convert debug printers to debug category printers drm/i915: Use debug category printer for welcome message drm/atomic: Use debug category printer for atomic state printer drm/print: Add tracefs support to the drm logging helpersDocumentation/gpu/drm-uapi.rst | 6 + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 4 +- drivers/gpu/drm/drm_atomic.c | 5 +- drivers/gpu/drm/drm_atomic_uapi.c | 2 +- drivers/gpu/drm/drm_crtc_internal.h | 3 +- drivers/gpu/drm/drm_dp_mst_topology.c | 9 +- drivers/gpu/drm/drm_drv.c | 3 + drivers/gpu/drm/drm_mipi_dbi.c | 8 +- drivers/gpu/drm/drm_print.c | 235 ++++++++++++++++--- drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 8 +- drivers/gpu/drm/i2c/sil164_drv.c | 12 +- drivers/gpu/drm/i915/display/intel_display.c | 4 +- drivers/gpu/drm/i915/i915_drv.c | 3 +- drivers/gpu/drm/i915/i915_utils.c | 5 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 20 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 4 +- include/drm/drm_print.h | 96 +++++++- 17 files changed, 329 insertions(+), 98 deletions(-)
Quoted 3 lines
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel