* [PATCH] drm/i915/dp: return number of bytes written for short aux/i2c writes
@ 2015-03-17 15:18 Jani Nikula
2015-03-17 16:40 ` Ville Syrjälä
2015-03-18 14:42 ` shuang.he
0 siblings, 2 replies; 4+ messages in thread
From: Jani Nikula @ 2015-03-17 15:18 UTC (permalink / raw)
To: intel-gfx; +Cc: 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 <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_dp.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 5256c064da05..3967af10f53c 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -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;
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915/dp: return number of bytes written for short aux/i2c writes
2015-03-17 15:18 [PATCH] drm/i915/dp: return number of bytes written for short aux/i2c writes Jani Nikula
@ 2015-03-17 16:40 ` Ville Syrjälä
2015-03-18 8:41 ` Daniel Vetter
2015-03-18 14:42 ` shuang.he
1 sibling, 1 reply; 4+ messages in thread
From: Ville Syrjälä @ 2015-03-17 16:40 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Tue, Mar 17, 2015 at 05:18:54PM +0200, Jani Nikula wrote:
> 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 <jani.nikula@intel.com>
Whoops :)
Looks correct to me.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 5256c064da05..3967af10f53c 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -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;
>
> --
> 2.1.4
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915/dp: return number of bytes written for short aux/i2c writes
2015-03-17 16:40 ` Ville Syrjälä
@ 2015-03-18 8:41 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2015-03-18 8:41 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: Jani Nikula, intel-gfx
On Tue, Mar 17, 2015 at 06:40:18PM +0200, Ville Syrjälä wrote:
> On Tue, Mar 17, 2015 at 05:18:54PM +0200, Jani Nikula wrote:
> > 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 <jani.nikula@intel.com>
>
> Whoops :)
>
> Looks correct to me.
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Queued for -next, thanks for the patch.
-Daniel
>
> > ---
> > drivers/gpu/drm/i915/intel_dp.c | 11 ++++++++---
> > 1 file changed, 8 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> > index 5256c064da05..3967af10f53c 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -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;
> >
> > --
> > 2.1.4
>
> --
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/dp: return number of bytes written for short aux/i2c writes
2015-03-17 15:18 [PATCH] drm/i915/dp: return number of bytes written for short aux/i2c writes Jani Nikula
2015-03-17 16:40 ` Ville Syrjälä
@ 2015-03-18 14:42 ` shuang.he
1 sibling, 0 replies; 4+ messages in thread
From: shuang.he @ 2015-03-18 14:42 UTC (permalink / raw)
To: shuang.he, ethan.gao, intel-gfx, jani.nikula
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
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
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-18 14:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-17 15:18 [PATCH] drm/i915/dp: return number of bytes written for short aux/i2c writes Jani Nikula
2015-03-17 16:40 ` Ville Syrjälä
2015-03-18 8:41 ` Daniel Vetter
2015-03-18 14:42 ` shuang.he
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.