diff options
| author | Andrey Grodzovsky <andrey.grodzovsky@amd.com> | 2021-01-22 16:29:56 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2021-07-01 00:24:40 -0400 |
| commit | 6240da4dfc99d727f8f28c574fac51413bea1837 (patch) | |
| tree | 002b8f922a7933266ab242dba8923549b9bb8a4a /drivers/gpu/drm | |
| parent | 2485f8cfff3898cb4dc51470f697775c27075967 (diff) | |
| download | linux-stable-6240da4dfc99d727f8f28c574fac51413bea1837.tar.gz linux-stable-6240da4dfc99d727f8f28c574fac51413bea1837.tar.bz2 linux-stable-6240da4dfc99d727f8f28c574fac51413bea1837.zip | |
dmr/amdgpu: Add RESTART handling also to smu_v11_0_i2c (VG20)
Also generilize the code to accept and translate to
HW bits any I2C relvent flags both for read and write.
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: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>
Acked-by: Alexander Deucher <Alexander.Deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c index 3193d566f4f8..5a90d9351b22 100644 --- a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c +++ b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c @@ -530,13 +530,11 @@ static bool smu_v11_0_i2c_bus_unlock(struct i2c_adapter *control) /***************************** I2C GLUE ****************************/ static uint32_t smu_v11_0_i2c_read_data(struct i2c_adapter *control, - struct i2c_msg *msg) + struct i2c_msg *msg, uint32_t i2c_flag) { - uint32_t ret = 0; + uint32_t ret; - /* Now read data starting with that address */ - ret = smu_v11_0_i2c_receive(control, msg->addr, msg->buf, msg->len, - I2C_RESTART); + ret = smu_v11_0_i2c_receive(control, msg->addr, msg->buf, msg->len, i2c_flag); if (ret != I2C_OK) DRM_ERROR("ReadData() - I2C error occurred :%x", ret); @@ -545,12 +543,11 @@ static uint32_t smu_v11_0_i2c_read_data(struct i2c_adapter *control, } static uint32_t smu_v11_0_i2c_write_data(struct i2c_adapter *control, - struct i2c_msg *msg) + struct i2c_msg *msg, uint32_t i2c_flag) { uint32_t ret; - /* Send I2C_NO_STOP unless requested to stop. */ - ret = smu_v11_0_i2c_transmit(control, msg->addr, msg->buf, msg->len, ((msg->flags & I2C_M_STOP) ? 0 : I2C_NO_STOP)); + ret = smu_v11_0_i2c_transmit(control, msg->addr, msg->buf, msg->len, i2c_flag); if (ret != I2C_OK) DRM_ERROR("WriteI2CData() - I2C error occurred :%x", ret); @@ -601,12 +598,17 @@ static int smu_v11_0_i2c_xfer(struct i2c_adapter *i2c_adap, smu_v11_0_i2c_init(i2c_adap); for (i = 0; i < num; i++) { + uint32_t i2c_flag = ((msgs[i].flags & I2C_M_NOSTART) ? 0 : I2C_RESTART) || + (((msgs[i].flags & I2C_M_STOP) ? 0 : I2C_NO_STOP)); + if (msgs[i].flags & I2C_M_RD) ret = smu_v11_0_i2c_read_data(i2c_adap, - msgs + i); + msgs + i, + i2c_flag); else ret = smu_v11_0_i2c_write_data(i2c_adap, - msgs + i); + msgs + i, + i2c_flag); if (ret != I2C_OK) { num = -EIO; |