From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C99ACC2D0DB for ; Thu, 23 Jan 2020 17:19:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AB64720704 for ; Thu, 23 Jan 2020 17:19:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB64720704 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A0936FD97; Thu, 23 Jan 2020 17:19:07 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B36C6FD97; Thu, 23 Jan 2020 17:19:05 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jan 2020 09:19:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,354,1574150400"; d="scan'208";a="245447835" Received: from mdroper-desk1.fm.intel.com (HELO mdroper-desk1.amr.corp.intel.com) ([10.1.27.64]) by orsmga002.jf.intel.com with ESMTP; 23 Jan 2020 09:19:04 -0800 Date: Thu, 23 Jan 2020 09:19:04 -0800 From: Matt Roper To: Ville Syrjala Subject: Re: [PATCH 2/3] drm/i915: Include the AUX CH name in the debug messages Message-ID: <20200123171904.GG2244136@mdroper-desk1.amr.corp.intel.com> References: <20200123154542.12271-1-ville.syrjala@linux.intel.com> <20200123154542.12271-2-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200123154542.12271-2-ville.syrjala@linux.intel.com> User-Agent: Mutt/1.12.1 (2019-06-15) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, Jan 23, 2020 at 05:45:41PM +0200, Ville Syrjala wrote: > From: Ville Syrj=E4l=E4 > = > To make it easier to figure out what caused a particular debug > message let's print out aux->name. > = > Signed-off-by: Ville Syrj=E4l=E4 It might be worth adding commas to some of these messages too while we're at it (e.g., "not started, status"). But either way, this is a really helpful cleanup. Reviewed-by: Matt Roper > --- > drivers/gpu/drm/i915/display/intel_dp.c | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i9= 15/display/intel_dp.c > index 1795963e1866..941f0f6d55c1 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -1186,7 +1186,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp) > trace_i915_reg_rw(false, ch_ctl, status, sizeof(status), true); > = > if (!done) > - DRM_ERROR("%s did not complete or timeout within %ums (status 0x%08x)\= n", > + DRM_ERROR("%s: did not complete or timeout within %ums (status 0x%08x)= \n", > intel_dp->aux.name, timeout_ms, status); > #undef C > = > @@ -1373,8 +1373,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > const u32 status =3D intel_uncore_read(uncore, ch_ctl); > = > if (status !=3D intel_dp->aux_busy_last_status) { > - WARN(1, "dp_aux_ch not started status 0x%08x\n", > - status); > + WARN(1, "%s: not started status 0x%08x\n", > + intel_dp->aux.name, status); > intel_dp->aux_busy_last_status =3D status; > } > = > @@ -1435,7 +1435,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > } > = > if ((status & DP_AUX_CH_CTL_DONE) =3D=3D 0) { > - DRM_ERROR("dp_aux_ch not done status 0x%08x\n", status); > + DRM_ERROR("%s: not done status 0x%08x\n", > + intel_dp->aux.name, status); > ret =3D -EBUSY; > goto out; > } > @@ -1445,7 +1446,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > * Timeouts occur when the sink is not connected > */ > if (status & DP_AUX_CH_CTL_RECEIVE_ERROR) { > - DRM_ERROR("dp_aux_ch receive error status 0x%08x\n", status); > + DRM_ERROR("%s: receive error status 0x%08x\n", > + intel_dp->aux.name, status); > ret =3D -EIO; > goto out; > } > @@ -1453,7 +1455,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > /* Timeouts occur when the device isn't connected, so they're > * "normal" -- don't fill the kernel log with these */ > if (status & DP_AUX_CH_CTL_TIME_OUT_ERROR) { > - DRM_DEBUG_KMS("dp_aux_ch timeout status 0x%08x\n", status); > + DRM_DEBUG_KMS("%s: timeout status 0x%08x\n", > + intel_dp->aux.name, status); > ret =3D -ETIMEDOUT; > goto out; > } > @@ -1468,8 +1471,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > * drm layer takes care for the necessary retries. > */ > if (recv_bytes =3D=3D 0 || recv_bytes > 20) { > - DRM_DEBUG_KMS("Forbidden recv_bytes =3D %d on aux transaction\n", > - recv_bytes); > + DRM_DEBUG_KMS("%s: Forbidden recv_bytes =3D %d on aux transaction\n", > + intel_dp->aux.name, recv_bytes); > ret =3D -EBUSY; > goto out; > } > -- = > 2.24.1 > = > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- = Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AA9CC2D0DB for ; Thu, 23 Jan 2020 17:19:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 08D8B20704 for ; Thu, 23 Jan 2020 17:19:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 08D8B20704 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 93B516FA28; Thu, 23 Jan 2020 17:19:06 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B36C6FD97; Thu, 23 Jan 2020 17:19:05 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jan 2020 09:19:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,354,1574150400"; d="scan'208";a="245447835" Received: from mdroper-desk1.fm.intel.com (HELO mdroper-desk1.amr.corp.intel.com) ([10.1.27.64]) by orsmga002.jf.intel.com with ESMTP; 23 Jan 2020 09:19:04 -0800 Date: Thu, 23 Jan 2020 09:19:04 -0800 From: Matt Roper To: Ville Syrjala Message-ID: <20200123171904.GG2244136@mdroper-desk1.amr.corp.intel.com> References: <20200123154542.12271-1-ville.syrjala@linux.intel.com> <20200123154542.12271-2-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200123154542.12271-2-ville.syrjala@linux.intel.com> User-Agent: Mutt/1.12.1 (2019-06-15) Subject: Re: [Intel-gfx] [PATCH 2/3] drm/i915: Include the AUX CH name in the debug messages X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Jan 23, 2020 at 05:45:41PM +0200, Ville Syrjala wrote: > From: Ville Syrj=E4l=E4 > = > To make it easier to figure out what caused a particular debug > message let's print out aux->name. > = > Signed-off-by: Ville Syrj=E4l=E4 It might be worth adding commas to some of these messages too while we're at it (e.g., "not started, status"). But either way, this is a really helpful cleanup. Reviewed-by: Matt Roper > --- > drivers/gpu/drm/i915/display/intel_dp.c | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i9= 15/display/intel_dp.c > index 1795963e1866..941f0f6d55c1 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -1186,7 +1186,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp) > trace_i915_reg_rw(false, ch_ctl, status, sizeof(status), true); > = > if (!done) > - DRM_ERROR("%s did not complete or timeout within %ums (status 0x%08x)\= n", > + DRM_ERROR("%s: did not complete or timeout within %ums (status 0x%08x)= \n", > intel_dp->aux.name, timeout_ms, status); > #undef C > = > @@ -1373,8 +1373,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > const u32 status =3D intel_uncore_read(uncore, ch_ctl); > = > if (status !=3D intel_dp->aux_busy_last_status) { > - WARN(1, "dp_aux_ch not started status 0x%08x\n", > - status); > + WARN(1, "%s: not started status 0x%08x\n", > + intel_dp->aux.name, status); > intel_dp->aux_busy_last_status =3D status; > } > = > @@ -1435,7 +1435,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > } > = > if ((status & DP_AUX_CH_CTL_DONE) =3D=3D 0) { > - DRM_ERROR("dp_aux_ch not done status 0x%08x\n", status); > + DRM_ERROR("%s: not done status 0x%08x\n", > + intel_dp->aux.name, status); > ret =3D -EBUSY; > goto out; > } > @@ -1445,7 +1446,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > * Timeouts occur when the sink is not connected > */ > if (status & DP_AUX_CH_CTL_RECEIVE_ERROR) { > - DRM_ERROR("dp_aux_ch receive error status 0x%08x\n", status); > + DRM_ERROR("%s: receive error status 0x%08x\n", > + intel_dp->aux.name, status); > ret =3D -EIO; > goto out; > } > @@ -1453,7 +1455,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > /* Timeouts occur when the device isn't connected, so they're > * "normal" -- don't fill the kernel log with these */ > if (status & DP_AUX_CH_CTL_TIME_OUT_ERROR) { > - DRM_DEBUG_KMS("dp_aux_ch timeout status 0x%08x\n", status); > + DRM_DEBUG_KMS("%s: timeout status 0x%08x\n", > + intel_dp->aux.name, status); > ret =3D -ETIMEDOUT; > goto out; > } > @@ -1468,8 +1471,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > * drm layer takes care for the necessary retries. > */ > if (recv_bytes =3D=3D 0 || recv_bytes > 20) { > - DRM_DEBUG_KMS("Forbidden recv_bytes =3D %d on aux transaction\n", > - recv_bytes); > + DRM_DEBUG_KMS("%s: Forbidden recv_bytes =3D %d on aux transaction\n", > + intel_dp->aux.name, recv_bytes); > ret =3D -EBUSY; > goto out; > } > -- = > 2.24.1 > = > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- = Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx