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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 02A05C433F5 for ; Wed, 9 Feb 2022 20:00:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6993C10E1FF; Wed, 9 Feb 2022 20:00:22 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3066E10E1FF for ; Wed, 9 Feb 2022 20:00:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644436821; x=1675972821; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=MRv1cHiu81cWTJTmcvS/2/rdnK7YoNnmuxRSDB/fIdE=; b=UOk/cdbraovKi//IjYjjNHTofDKIPSgOUhkLkebD5H9CY9/qEFdwULY/ OajPqXsDyZddbjuPtWMeupUd6rb1fWbTtvYXmP26QOJQi6pVnBDWwKYHq b9ohtqImOlsOtYQ809UyEV8xHCfLjZmDwnBH/ko1zyZ7cdUPUYQ0OmuSv 8NR6tkN3d9V8E6hIA70BwzrRdUIMLb1Yx1RK9+KAxTxeVTXcq9LaXy5Ta MiKol5KmwuHIjoMtkG83pUn1/W8+xw7Af8h8ZqAj3Q/MxO7d4F+rbMDp0 kOGFp3p4gw7bytMlEHZcO25QwuNvViVH8uhfW3OCMco6QuaoHTBcMyy0p A==; X-IronPort-AV: E=McAfee;i="6200,9189,10253"; a="249530444" X-IronPort-AV: E=Sophos;i="5.88,356,1635231600"; d="scan'208";a="249530444" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2022 12:00:20 -0800 X-IronPort-AV: E=Sophos;i="5.88,356,1635231600"; d="scan'208";a="526151021" 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; 09 Feb 2022 12:00:20 -0800 Date: Wed, 9 Feb 2022 12:00:26 -0800 From: "Navare, Manasi" To: Ville Syrjala Message-ID: <20220209200026.GC31646@labuser-Z97X-UD5H> References: <20220203183823.22890-1-ville.syrjala@linux.intel.com> <20220203183823.22890-10-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: <20220203183823.22890-10-ville.syrjala@linux.intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [Intel-gfx] [PATCH 09/10] drm/i915: Return both master and slave pipes from enabled_bigjoiner_pipes() 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 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Feb 03, 2022 at 08:38:22PM +0200, Ville Syrjala wrote: > From: Ville Syrjälä > > Return both the master and slave pipe bitmasks from > enabled_bigjoiner_pipes(). We'll have use for both during > readout soon. > > Signed-off-by: Ville Syrjälä This looks good, can this be just combined with the patch that would use the slave and mastr pipes in the readout ? Either way, Reviewed-by: Manasi Navare Manasi > --- > drivers/gpu/drm/i915/display/intel_display.c | 25 +++++++++++--------- > 1 file changed, 14 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 6df498fc720a..34b6b4ab3a1b 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -4064,11 +4064,14 @@ 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) > +static void enabled_bigjoiner_pipes(struct drm_i915_private *dev_priv, > + u8 *master_pipes, u8 *slave_pipes) > { > - u8 master_pipes = 0, slave_pipes = 0; > struct intel_crtc *crtc; > > + *master_pipes = 0; > + *slave_pipes = 0; > + > for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, > bigjoiner_pipes(dev_priv)) { > enum intel_display_power_domain power_domain; > @@ -4083,9 +4086,9 @@ static u8 enabled_bigjoiner_pipes(struct drm_i915_private *dev_priv) > continue; > > if (tmp & MASTER_BIG_JOINER_ENABLE) > - master_pipes |= BIT(pipe); > + *master_pipes |= BIT(pipe); > else > - slave_pipes |= BIT(pipe); > + *slave_pipes |= BIT(pipe); > } > > if (DISPLAY_VER(dev_priv) < 13) > @@ -4096,18 +4099,16 @@ static u8 enabled_bigjoiner_pipes(struct drm_i915_private *dev_priv) > u32 tmp = intel_de_read(dev_priv, ICL_PIPE_DSS_CTL1(pipe)); > > if (tmp & UNCOMPRESSED_JOINER_MASTER) > - master_pipes |= BIT(pipe); > + *master_pipes |= BIT(pipe); > if (tmp & UNCOMPRESSED_JOINER_SLAVE) > - slave_pipes |= BIT(pipe); > + *slave_pipes |= BIT(pipe); > } > } > > /* Bigjoiner pipes should always be consecutive master and slave */ > - drm_WARN(&dev_priv->drm, slave_pipes != master_pipes << 1, > + 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; > + *master_pipes, *slave_pipes); > } > > static u8 hsw_panel_transcoders(struct drm_i915_private *i915) > @@ -4126,6 +4127,7 @@ static u8 hsw_enabled_transcoders(struct intel_crtc *crtc) > struct drm_i915_private *dev_priv = to_i915(dev); > u8 panel_transcoder_mask = hsw_panel_transcoders(dev_priv); > enum transcoder cpu_transcoder; > + u8 master_pipes, slave_pipes; > u8 enabled_transcoders = 0; > > /* > @@ -4177,7 +4179,8 @@ static u8 hsw_enabled_transcoders(struct intel_crtc *crtc) > enabled_transcoders |= BIT(cpu_transcoder); > > /* bigjoiner slave -> consider the master pipe's transcoder as well */ > - if (enabled_bigjoiner_pipes(dev_priv) & BIT(crtc->pipe)) { > + enabled_bigjoiner_pipes(dev_priv, &master_pipes, &slave_pipes); > + if (slave_pipes & 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); > -- > 2.34.1 >