Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a18ac3a authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

drm/tinydrm: Remove spi debug buffer dumping 



The SPI event tracing can dump the buffer now so no need for this.
Remove the debug print from tinydrm_spi_transfer() since this info can be
gleaned from the trace event.

Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190719155916.62465-5-noralf@tronnes.org
parent cfcc8fcb

drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c

+0 −40
Original line number Diff line number Diff line
@@ -53,41 +53,6 @@ size_t tinydrm_spi_max_transfer_size(struct spi_device *spi, size_t max_len) 
}

EXPORT_SYMBOL(tinydrm_spi_max_transfer_size);



static void

tinydrm_dbg_spi_print(struct spi_device *spi, struct spi_transfer *tr,

		      const void *buf, int idx, bool tx)

{

	u32 speed_hz = tr->speed_hz ? tr->speed_hz : spi->max_speed_hz;

	char linebuf[3 * 32];



	hex_dump_to_buffer(buf, tr->len, 16,

			   DIV_ROUND_UP(tr->bits_per_word, 8),

			   linebuf, sizeof(linebuf), false);



	printk(KERN_DEBUG

	       "    tr(%i): speed=%u%s, bpw=%i, len=%u, %s_buf=[%s%s]\n", idx,

	       speed_hz > 1000000 ? speed_hz / 1000000 : speed_hz / 1000,

	       speed_hz > 1000000 ? "MHz" : "kHz", tr->bits_per_word, tr->len,

	       tx ? "tx" : "rx", linebuf, tr->len > 16 ? " ..." : "");

}



/* called through tinydrm_dbg_spi_message() */

void _tinydrm_dbg_spi_message(struct spi_device *spi, struct spi_message *m)

{

	struct spi_transfer *tmp;

	int i = 0;



	list_for_each_entry(tmp, &m->transfers, transfer_list) {



		if (tmp->tx_buf)

			tinydrm_dbg_spi_print(spi, tmp, tmp->tx_buf, i, true);

		if (tmp->rx_buf)

			tinydrm_dbg_spi_print(spi, tmp, tmp->rx_buf, i, false);

		i++;

	}

}

EXPORT_SYMBOL(_tinydrm_dbg_spi_message);



/**

 * tinydrm_spi_transfer - SPI transfer helper

 * @spi: SPI device
@@ -125,10 +90,6 @@ int tinydrm_spi_transfer(struct spi_device *spi, u32 speed_hz, 


	max_chunk = tinydrm_spi_max_transfer_size(spi, 0);



	if (drm_debug & DRM_UT_DRIVER)

		pr_debug("[drm:%s] bpw=%u, max_chunk=%zu, transfers:\n",

			 __func__, bpw, max_chunk);



	if (bpw == 16 && !spi_is_bpw_supported(spi, 16)) {

		tr.bits_per_word = 8;

		if (tinydrm_machine_little_endian()) {
@@ -162,7 +123,6 @@ int tinydrm_spi_transfer(struct spi_device *spi, u32 speed_hz, 
		buf += chunk;

		len -= chunk;



		tinydrm_dbg_spi_message(spi, &m);

		ret = spi_sync(spi, &m);

		if (ret)

			return ret;

drivers/gpu/drm/tinydrm/mipi-dbi.c

+0 −6
Original line number Diff line number Diff line
@@ -679,8 +679,6 @@ static int mipi_dbi_spi1e_transfer(struct mipi_dbi *mipi, int dc, 
		dst[8] = *src;

		tr.len = 9;



		tinydrm_dbg_spi_message(spi, &m);



		return spi_sync(spi, &m);

	}
@@ -758,7 +756,6 @@ static int mipi_dbi_spi1e_transfer(struct mipi_dbi *mipi, int dc, 


		tr.len = chunk + added;



		tinydrm_dbg_spi_message(spi, &m);

		ret = spi_sync(spi, &m);

		if (ret)

			return ret;
@@ -822,7 +819,6 @@ static int mipi_dbi_spi1_transfer(struct mipi_dbi *mipi, int dc, 
		tr.len = chunk;

		len -= chunk;



		tinydrm_dbg_spi_message(spi, &m);

		ret = spi_sync(spi, &m);

		if (ret)

			return ret;
@@ -898,8 +894,6 @@ static int mipi_dbi_typec3_command_read(struct mipi_dbi *mipi, u8 *cmd, 
	if (ret)

		goto err_free;



	tinydrm_dbg_spi_message(spi, &m);



	if (tr[1].len == len) {

		memcpy(data, buf, len);

	} else {

include/drm/tinydrm/tinydrm-helpers.h

+0 −25
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ struct drm_rect; 
struct drm_simple_display_pipe;

struct drm_simple_display_pipe_funcs;

struct spi_transfer;

struct spi_message;

struct spi_device;

struct device;
@@ -46,29 +45,5 @@ size_t tinydrm_spi_max_transfer_size(struct spi_device *spi, size_t max_len); 
int tinydrm_spi_transfer(struct spi_device *spi, u32 speed_hz,

			 struct spi_transfer *header, u8 bpw, const void *buf,

			 size_t len);

void _tinydrm_dbg_spi_message(struct spi_device *spi, struct spi_message *m);



#ifdef DEBUG

/**

 * tinydrm_dbg_spi_message - Dump SPI message

 * @spi: SPI device

 * @m: SPI message

 *

 * Dumps info about the transfers in a SPI message including buffer content.

 * DEBUG has to be defined for this function to be enabled alongside setting

 * the DRM_UT_DRIVER bit of &drm_debug.

 */

static inline void tinydrm_dbg_spi_message(struct spi_device *spi,

					   struct spi_message *m)

{

	if (drm_debug & DRM_UT_DRIVER)

		_tinydrm_dbg_spi_message(spi, m);

}

#else

static inline void tinydrm_dbg_spi_message(struct spi_device *spi,

					   struct spi_message *m)

{

}

#endif /* DEBUG */



#endif /* __LINUX_TINYDRM_HELPERS_H */