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

Commit 52f05898 authored by Lucas Stach's avatar Lucas Stach Committed by Greg Kroah-Hartman
Browse files

drm/bridge: analogix_dp: properly handle zero sized AUX transactions 



commit e82290a2e0e8ec5e836ecad1ca025021b3855c2d upstream.

Address only transactions without any data are valid and should not
be flagged as short transactions. Simply return the message size when
no transaction errors occured.

CC: stable@vger.kernel.org
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Reviewed-by: default avatarRobert Foss <rfoss@kernel.org>
Signed-off-by: default avatarRobert Foss <rfoss@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240318203925.2837689-1-l.stach@pengutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 34f36e6e

drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c

+1 −4
Original line number Diff line number Diff line
@@ -1109,7 +1109,6 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, 
	u32 status_reg;

	u8 *buffer = msg->buffer;

	unsigned int i;

	int num_transferred = 0;

	int ret;



	/* Buffer size of AUX CH is 16 bytes */
@@ -1161,7 +1160,6 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, 
			reg = buffer[i];

			writel(reg, dp->reg_base + ANALOGIX_DP_BUF_DATA_0 +

			       4 * i);

			num_transferred++;

		}

	}
@@ -1209,7 +1207,6 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, 
			reg = readl(dp->reg_base + ANALOGIX_DP_BUF_DATA_0 +

				    4 * i);

			buffer[i] = (unsigned char)reg;

			num_transferred++;

		}

	}
@@ -1226,7 +1223,7 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, 
		 (msg->request & ~DP_AUX_I2C_MOT) == DP_AUX_NATIVE_READ)

		msg->reply = DP_AUX_NATIVE_REPLY_ACK;



	return num_transferred > 0 ? num_transferred : -EBUSY;

	return msg->size;



aux_error:

	/* if aux err happen, reset aux */