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, URIBL_BLOCKED,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 A3097C433E1 for ; Tue, 16 Jun 2020 15:46:27 +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 86F162071A for ; Tue, 16 Jun 2020 15:46:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86F162071A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 3AD2D6E8FB; Tue, 16 Jun 2020 15:46:27 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3ECD06E8FB for ; Tue, 16 Jun 2020 15:46:26 +0000 (UTC) IronPort-SDR: tO60hWj4jusorNYjMsVQne5hQFr9O9/h8wfp8F+qtebpkhp7czYyK/kZLi+a/3xJMl70RykPE5 XYPnJY1SmIzg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2020 08:46:25 -0700 IronPort-SDR: Sy0FpN00RjK1J7cebDLotk8C5ZHXKr5h9D3ZaS60sZy3GfV6qeoZXxmjFXTHgXaJWtBomy773d vg44pU075qAA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,518,1583222400"; d="scan'208";a="382907184" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga001.fm.intel.com with SMTP; 16 Jun 2020 08:46:23 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 16 Jun 2020 18:46:22 +0300 Date: Tue, 16 Jun 2020 18:46:22 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Imre Deak Message-ID: <20200616154622.GZ6112@intel.com> References: <20200616141855.746-1-imre.deak@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200616141855.746-1-imre.deak@intel.com> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH 1/6] drm/i915/tgl+: Use the correct DP_TP_* register instances in MST encoders 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 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 Tue, Jun 16, 2020 at 05:18:50PM +0300, Imre Deak wrote: > MST encoders must use the master MST transcoder's DP_TP_STATUS and > DP_TP_CONTROL registers. Atm, during the HW readout of a slave > transcoder's CRTC state we reset these register addresses in > intel_dp::regs.dp_tp_* to the slave transcoder's DP_TP_* register > addresses incorrectly; fix this. > = > This issue led at least to > 'Timed out waiting for ACT sent when disabling' > errors during output disabling in a multiple MST stream config. > = > This change replaces > https://patchwork.freedesktop.org/patch/369577/?series=3D78193&rev=3D1 > which just papered over the problem. > = > Cc: Ville Syrj=E4l=E4 > Cc: Jos=E9 Roberto de Souza > Signed-off-by: Imre Deak Reviewed-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i= 915/display/intel_ddi.c > index ca7bb2294d2b..73d6cc29291a 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -4193,11 +4193,6 @@ void intel_ddi_get_config(struct intel_encoder *en= coder, > if (drm_WARN_ON(&dev_priv->drm, transcoder_is_dsi(cpu_transcoder))) > return; > = > - if (INTEL_GEN(dev_priv) >=3D 12) { > - intel_dp->regs.dp_tp_ctl =3D TGL_DP_TP_CTL(cpu_transcoder); > - intel_dp->regs.dp_tp_status =3D TGL_DP_TP_STATUS(cpu_transcoder); > - } > - > intel_dsc_get_config(encoder, pipe_config); > = > temp =3D intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder)); > @@ -4299,6 +4294,16 @@ void intel_ddi_get_config(struct intel_encoder *en= coder, > break; > } > = > + if (INTEL_GEN(dev_priv) >=3D 12) { > + enum transcoder transcoder =3D > + intel_dp_mst_is_slave_trans(pipe_config) ? > + pipe_config->mst_master_transcoder : > + pipe_config->cpu_transcoder; > + > + intel_dp->regs.dp_tp_ctl =3D TGL_DP_TP_CTL(transcoder); > + intel_dp->regs.dp_tp_status =3D TGL_DP_TP_STATUS(transcoder); > + } > + > pipe_config->has_audio =3D > intel_ddi_is_audio_enabled(dev_priv, cpu_transcoder); > = > -- = > 2.23.1 -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx