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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C2ECC433F5 for ; Wed, 20 Oct 2021 20:23:06 +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 247FF61371 for ; Wed, 20 Oct 2021 20:23:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 247FF61371 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C77FB6E3B2; Wed, 20 Oct 2021 20:23:05 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 31BC46E3B2 for ; Wed, 20 Oct 2021 20:23:04 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10143"; a="216040422" X-IronPort-AV: E=Sophos;i="5.87,167,1631602800"; d="scan'208";a="216040422" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 13:23:03 -0700 X-IronPort-AV: E=Sophos;i="5.87,167,1631602800"; d="scan'208";a="483871030" Received: from labuser-z97x-ud5h.jf.intel.com (HELO labuser-Z97X-UD5H) ([10.165.21.211]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 13:23:03 -0700 Date: Wed, 20 Oct 2021 13:35:32 -0700 From: "Navare, Manasi" To: Ville Syrjala Cc: intel-gfx@lists.freedesktop.org Message-ID: <20211020203531.GA25526@labuser-Z97X-UD5H> References: <20210913144440.23008-1-ville.syrjala@linux.intel.com> <20210913144440.23008-15-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210913144440.23008-15-ville.syrjala@linux.intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [Intel-gfx] [PATCH 14/16] drm/i915: Perform correct cpu_transcoder readout for bigjoiner 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, Sep 13, 2021 at 05:44:38PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä > > Read out cpu_transcoder correctly for the bigjoiner slave pipes. > > Signed-off-by: Ville Syrjälä Reviewed-by: Manasi Navare Manasi > --- > drivers/gpu/drm/i915/display/intel_display.c | 66 ++++++++++++++++++++ > 1 file changed, 66 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 4e659a103984..25ae9e4f6b66 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -5581,6 +5581,16 @@ static bool ilk_get_pipe_config(struct intel_crtc *crtc, > return ret; > } > > +static u8 bigjoiner_pipes(struct drm_i915_private *i915) > +{ > + if (DISPLAY_VER(i915) >= 12) > + return BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D); > + else if (DISPLAY_VER(i915) >= 11) > + return BIT(PIPE_B) | BIT(PIPE_C); > + else > + return 0; > +} > + > static bool transcoder_ddi_func_is_enabled(struct drm_i915_private *dev_priv, > enum transcoder cpu_transcoder) > { > @@ -5596,6 +5606,54 @@ static bool transcoder_ddi_func_is_enabled(struct drm_i915_private *dev_priv, > return tmp & TRANS_DDI_FUNC_ENABLE; > } > > +static u8 enabled_bigjoiner_pipes(struct drm_i915_private *dev_priv) > +{ > + u8 master_pipes = 0, slave_pipes = 0; > + struct intel_crtc *crtc; > + > + for_each_intel_crtc(&dev_priv->drm, crtc) { > + enum intel_display_power_domain power_domain; > + enum pipe pipe = crtc->pipe; > + intel_wakeref_t wakeref; > + > + if ((bigjoiner_pipes(dev_priv) & BIT(pipe)) == 0) > + continue; > + > + power_domain = intel_dsc_power_domain(crtc, (enum transcoder) pipe); > + with_intel_display_power_if_enabled(dev_priv, power_domain, wakeref) { > + u32 tmp = intel_de_read(dev_priv, ICL_PIPE_DSS_CTL1(pipe)); > + > + if (!(tmp & BIG_JOINER_ENABLE)) > + continue; > + > + if (tmp & MASTER_BIG_JOINER_ENABLE) > + master_pipes |= BIT(pipe); > + else > + slave_pipes |= BIT(pipe); > + } > + > + if (DISPLAY_VER(dev_priv) < 13) > + continue; > + > + power_domain = POWER_DOMAIN_PIPE(pipe); > + with_intel_display_power_if_enabled(dev_priv, power_domain, wakeref) { > + u32 tmp = intel_de_read(dev_priv, ICL_PIPE_DSS_CTL1(pipe)); > + > + if (tmp & UNCOMPRESSED_JOINER_MASTER) > + master_pipes |= BIT(pipe); > + if (tmp & UNCOMPRESSED_JOINER_SLAVE) > + slave_pipes |= BIT(pipe); > + } > + } > + > + /* Bigjoiner pipes should always be consecutive master and slave */ > + drm_WARN(&dev_priv->drm, slave_pipes != master_pipes << 1, > + "Bigjoiner misconfigured (master pipes 0x%x, slave pipes 0x%x)\n", > + master_pipes, slave_pipes); > + > + return slave_pipes; > +} > + > static u8 hsw_panel_transcoders(struct drm_i915_private *i915) > { > u8 panel_transcoder_mask = BIT(TRANSCODER_EDP); > @@ -5657,10 +5715,18 @@ static u8 hsw_enabled_transcoders(struct intel_crtc *crtc) > enabled_transcoders |= BIT(cpu_transcoder); > } > > + /* single pipe or bigjoiner master */ > cpu_transcoder = (enum transcoder) crtc->pipe; > if (transcoder_ddi_func_is_enabled(dev_priv, cpu_transcoder)) > enabled_transcoders |= BIT(cpu_transcoder); > > + /* bigjoiner slave -> consider the master pipe's transcoder as well */ > + if (enabled_bigjoiner_pipes(dev_priv) & BIT(crtc->pipe)) { > + cpu_transcoder = (enum transcoder) crtc->pipe - 1; > + if (transcoder_ddi_func_is_enabled(dev_priv, cpu_transcoder)) > + enabled_transcoders |= BIT(cpu_transcoder); > + } > + > return enabled_transcoders; > } > > -- > 2.32.0 >