Commit 6a0a55a2 authored by Andrey Grodzovsky's avatar Andrey Grodzovsky Committed by Alex Deucher
Browse files

drm/amdgpu: Send STOP for the last byte of msg only 



Let's just ignore the I2C_M_STOP hint from upper
layer for SMU I2C code as there is no clean
mapping between single per I2C message STOP flag
at the kernel I2C layer and the SMU, per each byte
STOP flag. We will just by default set it at the
end of the SMU I2C message.

Cc: Jean Delvare <jdelvare@suse.de>
Cc: Alexander Deucher <Alexander.Deucher@amd.com>
Cc: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Cc: Lijo Lazar <Lijo.Lazar@amd.com>
Cc: Stanley Yang <Stanley.Yang@amd.com>
Cc: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Suggested-by: default avatarLazar Lijo <Lijo.Lazar@amd.com>
Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Reviewed-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Acked-by: default avatarAlexander Deucher <Alexander.Deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 965ec37c

drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c

+2 −2
Original line number Diff line number Diff line
@@ -1981,9 +1981,9 @@ static int arcturus_i2c_xfer(struct i2c_adapter *i2c_adap, 
				cmd->CmdConfig |= I2C_CMD_WRITE;

				cmd->RegisterAddr = msg->buf[j];

			}

			if ((msg[i].flags & I2C_M_STOP) ||

			    (!remaining_bytes))

			if (!remaining_bytes)

				cmd->CmdConfig |= CMDCONFIG_STOP_MASK;



			if ((j == 0) && !(msg[i].flags & I2C_M_NOSTART))

				cmd->CmdConfig |= CMDCONFIG_RESTART_BIT;

		}

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c

+2 −2
Original line number Diff line number Diff line
@@ -2780,9 +2780,9 @@ static int navi10_i2c_xfer(struct i2c_adapter *i2c_adap, 
				cmd->CmdConfig |= I2C_CMD_WRITE;

				cmd->RegisterAddr = msg->buf[j];

			}

			if ((msg[i].flags & I2C_M_STOP) ||

			    (!remaining_bytes))

			if (!remaining_bytes)

				cmd->CmdConfig |= CMDCONFIG_STOP_MASK;



			if ((j == 0) && !(msg[i].flags & I2C_M_NOSTART))

				cmd->CmdConfig |= CMDCONFIG_RESTART_BIT;

		}

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c

+2 −2
Original line number Diff line number Diff line
@@ -3487,9 +3487,9 @@ static int sienna_cichlid_i2c_xfer(struct i2c_adapter *i2c_adap, 
				cmd->CmdConfig |= CMDCONFIG_READWRITE_MASK;

				cmd->ReadWriteData = msg->buf[j];

			}

			if ((msg[i].flags & I2C_M_STOP) ||

			    (!remaining_bytes))

			if (!remaining_bytes)

				cmd->CmdConfig |= CMDCONFIG_STOP_MASK;



			if ((j == 0) && !(msg[i].flags & I2C_M_NOSTART))

				cmd->CmdConfig |= CMDCONFIG_RESTART_BIT;

		}