drm/i915/dp: return number of bytes written for short aux/i2c writes
Subsystems (2)
PATCH 1/1 drm/i915/dp: return number of bytes written for short aux/i2c writes
Allow for a larger receive data size, and check if the receiver returned the number of bytes written. Without this, we've basically skipped all the unwritten bytes for short writes.
--- drivers/gpu/drm/i915/intel_dp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +8 -3
@@ -951,7 +951,7 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)case DP_AUX_NATIVE_WRITE :case DP_AUX_I2C_WRITE : txsize = msg->size ?HEADER_SIZE + msg->size :BARE_ADDRESS_SIZE ; - rxsize =1 ; + rxsize =2 ;/* 0 or 1 data bytes */ if (WARN_ON (txsize >20 ))return -E2BIG ;
@@ -962,8 +962,13 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)if (ret >0 ) { msg->reply = rxbuf[0 ] >>4 ; -/* Return payload size. */ - ret = msg->size; +if (ret >1 ) { +/* Number of bytes written in a short write. */ + ret =clamp_t (int, rxbuf[1 ],0 , msg->size); + }else { +/* Return payload size. */ + ret = msg->size; + } }break ;
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Jani Nikula
Allow for a larger receive data size, and check if the receiver returned the number of bytes written. Without this, we've basically skipped all the unwritten bytes for short writes.
Signed-off-by Jani Nikula <[email protected]>
Whoops :)
Looks correct to me.
Quoted 35 lines
--- drivers/gpu/drm/i915/intel_dp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_dp.c +8
-3@@ -951,7 +951,7 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)case DP_AUX_NATIVE_WRITE :case DP_AUX_I2C_WRITE : txsize = msg->size ?HEADER_SIZE + msg->size :BARE_ADDRESS_SIZE ; - rxsize =1 ; + rxsize =2 ;/* 0 or 1 data bytes */ if (WARN_ON (txsize >20 ))return -E2BIG ;@@ -962,8 +962,13 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)if (ret >0 ) { msg->reply = rxbuf[0 ] >>4 ; -/* Return payload size. */ - ret = msg->size; +if (ret >1 ) { +/* Number of bytes written in a short write. */ + ret =clamp_t (int, rxbuf[1 ],0 , msg->size); + }else { +/* Return payload size. */ + ret = msg->size; + } }break ;Signature · 1 line
2.1.4
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 5 lines · Ville Syrjälä
Quoted 4 lines · Jani Nikula
Allow for a larger receive data size, and check if the receiver returned the number of bytes written. Without this, we've basically skipped all the unwritten bytes for short writes.
Quoted 7 lines
Quoted 1 line
Signed-off-by Jani Nikula <[email protected]>Whoops :)
Looks correct to me.
Reviewed-by Ville Syrjälä <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 44 lines
Quoted 36 lines
--- drivers/gpu/drm/i915/intel_dp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_dp.c +8
-3@@ -951,7 +951,7 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)case DP_AUX_NATIVE_WRITE :case DP_AUX_I2C_WRITE : txsize = msg->size ?HEADER_SIZE + msg->size :BARE_ADDRESS_SIZE ; - rxsize =1 ; + rxsize =2 ;/* 0 or 1 data bytes */ if (WARN_ON (txsize >20 ))return -E2BIG ;@@ -962,8 +962,13 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)if (ret >0 ) { msg->reply = rxbuf[0 ] >>4 ; -/* Return payload size. */ - ret = msg->size; +if (ret >1 ) { +/* Number of bytes written in a short write. */ + ret =clamp_t (int, rxbuf[1 ],0 , msg->size); + }else { +/* Return payload size. */ + ret = msg->size; + } }break ;Signature · 1 line
2.1.4Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 5985 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -2 268/268 266/268
ILK 303/303 303/303 SNB 283/283 283/283 IVB 343/343 343/343 BYT 287/287 287/287 HSW 363/363 363/363 BDW 308/308 308/308
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
PNV igt_gem_userptr_blits_coherency-sync CRASH(1)PASS(3) CRASH(1)PASS(1)
PNV igt_gem_tiled_pread_pwrite FAIL(1)PASS(3) FAIL(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx