Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/dp: use seq buf for printing rates

Hand rolling the buffer overflow handling with snprintf() is a bit
tedious. The seq_buf interface is made for this. Switch to it.

Use struct intel_display while at it.

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241127131838.3268735-1-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

+14 -22
+14 -22
drivers/gpu/drm/i915/display/intel_dp.c
··· 28 28 #include <linux/export.h> 29 29 #include <linux/i2c.h> 30 30 #include <linux/notifier.h> 31 + #include <linux/seq_buf.h> 31 32 #include <linux/slab.h> 32 33 #include <linux/sort.h> 33 34 #include <linux/string_helpers.h> ··· 1507 1506 return DISPLAY_VER(i915) >= 10; 1508 1507 } 1509 1508 1510 - static void snprintf_int_array(char *str, size_t len, 1511 - const int *array, int nelem) 1509 + static void seq_buf_print_array(struct seq_buf *s, const int *array, int nelem) 1512 1510 { 1513 1511 int i; 1514 1512 1515 - str[0] = '\0'; 1516 - 1517 - for (i = 0; i < nelem; i++) { 1518 - int r = snprintf(str, len, "%s%d", i ? ", " : "", array[i]); 1519 - if (r >= len) 1520 - return; 1521 - str += r; 1522 - len -= r; 1523 - } 1513 + for (i = 0; i < nelem; i++) 1514 + seq_buf_printf(s, "%s%d", i ? ", " : "", array[i]); 1524 1515 } 1525 1516 1526 1517 static void intel_dp_print_rates(struct intel_dp *intel_dp) 1527 1518 { 1528 - struct drm_i915_private *i915 = dp_to_i915(intel_dp); 1529 - char str[128]; /* FIXME: too big for stack? */ 1519 + struct intel_display *display = to_intel_display(intel_dp); 1520 + DECLARE_SEQ_BUF(s, 128); /* FIXME: too big for stack? */ 1530 1521 1531 1522 if (!drm_debug_enabled(DRM_UT_KMS)) 1532 1523 return; 1533 1524 1534 - snprintf_int_array(str, sizeof(str), 1535 - intel_dp->source_rates, intel_dp->num_source_rates); 1536 - drm_dbg_kms(&i915->drm, "source rates: %s\n", str); 1525 + seq_buf_print_array(&s, intel_dp->source_rates, intel_dp->num_source_rates); 1526 + drm_dbg_kms(display->drm, "source rates: %s\n", seq_buf_str(&s)); 1537 1527 1538 - snprintf_int_array(str, sizeof(str), 1539 - intel_dp->sink_rates, intel_dp->num_sink_rates); 1540 - drm_dbg_kms(&i915->drm, "sink rates: %s\n", str); 1528 + seq_buf_clear(&s); 1529 + seq_buf_print_array(&s, intel_dp->sink_rates, intel_dp->num_sink_rates); 1530 + drm_dbg_kms(display->drm, "sink rates: %s\n", seq_buf_str(&s)); 1541 1531 1542 - snprintf_int_array(str, sizeof(str), 1543 - intel_dp->common_rates, intel_dp->num_common_rates); 1544 - drm_dbg_kms(&i915->drm, "common rates: %s\n", str); 1532 + seq_buf_clear(&s); 1533 + seq_buf_print_array(&s, intel_dp->common_rates, intel_dp->num_common_rates); 1534 + drm_dbg_kms(display->drm, "common rates: %s\n", seq_buf_str(&s)); 1545 1535 } 1546 1536 1547 1537 static int forced_link_rate(struct intel_dp *intel_dp)