From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/dp_helper: don't return EPROTO for defers (v2) Date: Fri, 04 Apr 2014 13:36:52 +0300 Message-ID: <87zjk19y9n.fsf@intel.com> References: <1396605019-5312-1-git-send-email-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id C91916ED21 for ; Fri, 4 Apr 2014 03:36:16 -0700 (PDT) In-Reply-To: <1396605019-5312-1-git-send-email-airlied@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dave Airlie , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Fri, 04 Apr 2014, Dave Airlie wrote: > From: Dave Airlie > > If we get a msg.reply of REPLY_DEFER, we also get an err of 0 > so we fail reads with 0 < size and return -EPROTO instead of trying > again. > > v2: same fix in i2c code. > > Found writing MST support. > Reviewed-by: Jani Nikula > Signed-off-by: Dave Airlie > --- > drivers/gpu/drm/drm_dp_helper.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c > index f4babed..2767148 100644 > --- a/drivers/gpu/drm/drm_dp_helper.c > +++ b/drivers/gpu/drm/drm_dp_helper.c > @@ -386,11 +386,11 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, > return err; > } > > - if (err < size) > - return -EPROTO; > > switch (msg.reply & DP_AUX_NATIVE_REPLY_MASK) { > case DP_AUX_NATIVE_REPLY_ACK: > + if (err < size) > + return -EPROTO; > return err; > > case DP_AUX_NATIVE_REPLY_NACK: > @@ -599,8 +599,6 @@ static int drm_dp_i2c_do_msg(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) > return err; > } > > - if (err < msg->size) > - return -EPROTO; > > switch (msg->reply & DP_AUX_NATIVE_REPLY_MASK) { > case DP_AUX_NATIVE_REPLY_ACK: > @@ -639,6 +637,8 @@ static int drm_dp_i2c_do_msg(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) > * Both native ACK and I2C ACK replies received. We > * can assume the transfer was successful. > */ > + if (err < msg->size) > + return -EPROTO; > return 0; > > case DP_AUX_I2C_REPLY_NACK: > -- > 1.8.5.3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Jani Nikula, Intel Open Source Technology Center