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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 001BFC48BE8 for ; Mon, 14 Jun 2021 08:20:51 +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 B556B608FC for ; Mon, 14 Jun 2021 08:20:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B556B608FC 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 4C1FF89C3B; Mon, 14 Jun 2021 08:20:51 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id A2A5789C3B for ; Mon, 14 Jun 2021 08:20:50 +0000 (UTC) IronPort-SDR: 97UOEpBRLv03ninTc4LUKquCZ59V6LGZXLqXRVwyw+HHwiSHEa+abYVckiKgi/pKU5X0/tcQd7 pIWPo+rPVTkw== X-IronPort-AV: E=McAfee;i="6200,9189,10014"; a="192888465" X-IronPort-AV: E=Sophos;i="5.83,272,1616482800"; d="scan'208";a="192888465" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2021 01:20:47 -0700 IronPort-SDR: +bfnQUxYu+gTshTkzhc/pluqDA84UxkEPpuhHW2tQy1KwHviJbCbtcD8eTEMhUe2Fr3l+BZo+K fp1VczqP/SOw== X-IronPort-AV: E=Sophos;i="5.83,272,1616482800"; d="scan'208";a="554026240" Received: from alampel-mobl.ger.corp.intel.com (HELO localhost) ([10.252.36.98]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2021 01:20:44 -0700 From: Jani Nikula To: "Navare\, Manasi" In-Reply-To: <20210611231846.GA12407@labuser-Z97X-UD5H> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210610090528.20511-1-jani.nikula@intel.com> <20210611231846.GA12407@labuser-Z97X-UD5H> Date: Mon, 14 Jun 2021 11:20:41 +0300 Message-ID: <87wnqwyi06.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH v2] drm/i915/dsc: abstract helpers to get bigjoiner primary/secondary crtc 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="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, 11 Jun 2021, "Navare, Manasi" wrote: > On Thu, Jun 10, 2021 at 12:05:28PM +0300, Jani Nikula wrote: >> Add a single point of truth for figuring out the primary/secondary crtc >> for bigjoiner instead of duplicating the magic pipe +/- 1 in multiple >> places. >> >> Also fix the pipe validity checks to properly take non-contiguous pipes >> into account. The current checks may theoretically overflow >> i915->pipe_to_crtc_mapping[pipe], albeit with a warning, due to fused >> off pipes, as INTEL_NUM_PIPES() returns the actual number of pipes on >> the platform, and the check is for INTEL_NUM_PIPES() == pipe + 1. >> >> Prefer primary/secondary terminology going forward. >> >> v2: >> - Improved abstractions for pipe validity etc. >> >> Fixes: 8a029c113b17 ("drm/i915/dp: Modify VDSC helpers to configure DSC for Bigjoiner slave") >> Fixes: d961eb20adb6 ("drm/i915/bigjoiner: atomic commit changes for uncompressed joiner") >> Cc: Animesh Manna >> Cc: Manasi Navare >> Cc: Vandita Kulkarni >> Signed-off-by: Jani Nikula >> >> --- >> >> Dropped patch 2/2 [1], as the pipes need to be adjacent for big joiner, >> even if pipes have been fused off. >> >> [1] https://patchwork.freedesktop.org/patch/msgid/20210603122842.22496-2-jani.nikula@intel.com >> --- >> drivers/gpu/drm/i915/display/intel_display.c | 7 ++-- >> .../drm/i915/display/intel_display_types.h | 8 ++++ >> drivers/gpu/drm/i915/display/intel_vdsc.c | 40 +++++++++++++------ >> drivers/gpu/drm/i915/display/intel_vdsc.h | 1 + >> 4 files changed, 40 insertions(+), 16 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c >> index 362bff9beb5c..3bad4e00f7be 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display.c >> +++ b/drivers/gpu/drm/i915/display/intel_display.c >> @@ -9618,7 +9618,6 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state, >> struct intel_crtc_state *old_crtc_state, >> struct intel_crtc_state *new_crtc_state) >> { >> - struct drm_i915_private *dev_priv = to_i915(state->base.dev); >> struct intel_crtc_state *slave_crtc_state, *master_crtc_state; >> struct intel_crtc *slave, *master; >> >> @@ -9634,15 +9633,15 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state, >> if (!new_crtc_state->bigjoiner) >> return 0; >> >> - if (1 + crtc->pipe >= INTEL_NUM_PIPES(dev_priv)) { >> + slave = intel_dsc_get_bigjoiner_secondary(crtc); >> + if (!slave) { >> DRM_DEBUG_KMS("[CRTC:%d:%s] Big joiner configuration requires " >> "CRTC + 1 to be used, doesn't exist\n", >> crtc->base.base.id, crtc->base.name); >> return -EINVAL; >> } >> >> - slave = new_crtc_state->bigjoiner_linked_crtc = >> - intel_get_crtc_for_pipe(dev_priv, crtc->pipe + 1); >> + new_crtc_state->bigjoiner_linked_crtc = slave; >> slave_crtc_state = intel_atomic_get_crtc_state(&state->base, slave); >> master = crtc; >> if (IS_ERR(slave_crtc_state)) >> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h >> index 15e91a99c8b9..7d64d8487fbe 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display_types.h >> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h >> @@ -1723,6 +1723,14 @@ vlv_pipe_to_channel(enum pipe pipe) >> } >> } >> >> +static inline bool intel_pipe_valid(struct drm_i915_private *i915, enum pipe pipe) >> +{ >> + return (pipe >= 0 && >> + pipe < ARRAY_SIZE(i915->pipe_to_crtc_mapping) && >> + INTEL_INFO(i915)->pipe_mask & BIT(pipe) && >> + i915->pipe_to_crtc_mapping[pipe]); > > So no need to check INTEL_NUM_PIPES as long as the index exists in pipe_to_crtc_mappings correct? Checking against INTEL_NUM_PIPES() is just plain wrong, because pipe may be >= INTEL_NUM_PIPES() if pipes have been fused off. > >> +} >> + >> static inline struct intel_crtc * >> intel_get_first_crtc(struct drm_i915_private *dev_priv) >> { >> diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c >> index 7121b66bf96d..85749370508c 100644 >> --- a/drivers/gpu/drm/i915/display/intel_vdsc.c >> +++ b/drivers/gpu/drm/i915/display/intel_vdsc.c >> @@ -1106,6 +1106,27 @@ static i915_reg_t dss_ctl2_reg(const struct intel_crtc_state *crtc_state) >> return is_pipe_dsc(crtc_state) ? ICL_PIPE_DSS_CTL2(pipe) : DSS_CTL2; >> } >> >> +static struct intel_crtc * >> +_get_crtc_for_pipe(struct drm_i915_private *i915, enum pipe pipe) >> +{ >> + if (!intel_pipe_valid(i915, pipe)) >> + return NULL; >> + >> + return intel_get_crtc_for_pipe(i915, pipe); >> +} > > Can we not include intel_pipe_valid() check in intel_get_crtc_for_pipe() so that any other function that calls intel_get_crtc_for_pipe() also > validates the pipe ? There's a use case for intel_dsc_get_bigjoiner_secondary() that requires graceful error handling withouth a WARN. intel_get_crtc_for_pipe() always WARNs on invalid pipe. We should probably use intel_pipe_valid() in intel_get_crtc_for_pipe() too, and WARN, but that's for another patch another time. BR, Jani. > > Manasi > > >> + >> +struct intel_crtc * >> +intel_dsc_get_bigjoiner_secondary(const struct intel_crtc *primary_crtc) >> +{ >> + return _get_crtc_for_pipe(to_i915(primary_crtc->base.dev), primary_crtc->pipe + 1); >> +} >> + >> +static struct intel_crtc * >> +intel_dsc_get_bigjoiner_primary(const struct intel_crtc *secondary_crtc) >> +{ >> + return _get_crtc_for_pipe(to_i915(secondary_crtc->base.dev), secondary_crtc->pipe - 1); >> +} >> + >> void intel_uncompressed_joiner_enable(const struct intel_crtc_state *crtc_state) >> { >> struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); >> @@ -1178,15 +1199,13 @@ void intel_uncompressed_joiner_get_config(struct intel_crtc_state *crtc_state) >> dss_ctl1 = intel_de_read(dev_priv, dss_ctl1_reg(crtc_state)); >> if (dss_ctl1 & UNCOMPRESSED_JOINER_MASTER) { >> crtc_state->bigjoiner = true; >> - if (!WARN_ON(INTEL_NUM_PIPES(dev_priv) == crtc->pipe + 1)) >> - crtc_state->bigjoiner_linked_crtc = >> - intel_get_crtc_for_pipe(dev_priv, crtc->pipe + 1); >> + crtc_state->bigjoiner_linked_crtc = intel_dsc_get_bigjoiner_secondary(crtc); >> + drm_WARN_ON(&dev_priv->drm, !crtc_state->bigjoiner_linked_crtc); >> } else if (dss_ctl1 & UNCOMPRESSED_JOINER_SLAVE) { >> crtc_state->bigjoiner = true; >> crtc_state->bigjoiner_slave = true; >> - if (!WARN_ON(crtc->pipe == PIPE_A)) >> - crtc_state->bigjoiner_linked_crtc = >> - intel_get_crtc_for_pipe(dev_priv, crtc->pipe - 1); >> + crtc_state->bigjoiner_linked_crtc = intel_dsc_get_bigjoiner_primary(crtc); >> + drm_WARN_ON(&dev_priv->drm, !crtc_state->bigjoiner_linked_crtc); >> } >> } >> >> @@ -1224,14 +1243,11 @@ void intel_dsc_get_config(struct intel_crtc_state *crtc_state) >> >> if (!(dss_ctl1 & MASTER_BIG_JOINER_ENABLE)) { >> crtc_state->bigjoiner_slave = true; >> - if (!WARN_ON(crtc->pipe == PIPE_A)) >> - crtc_state->bigjoiner_linked_crtc = >> - intel_get_crtc_for_pipe(dev_priv, crtc->pipe - 1); >> + crtc_state->bigjoiner_linked_crtc = intel_dsc_get_bigjoiner_primary(crtc); >> } else { >> - if (!WARN_ON(INTEL_NUM_PIPES(dev_priv) == crtc->pipe + 1)) >> - crtc_state->bigjoiner_linked_crtc = >> - intel_get_crtc_for_pipe(dev_priv, crtc->pipe + 1); >> + crtc_state->bigjoiner_linked_crtc = intel_dsc_get_bigjoiner_secondary(crtc); >> } >> + drm_WARN_ON(&dev_priv->drm, !crtc_state->bigjoiner_linked_crtc); >> } >> >> /* FIXME: add more state readout as needed */ >> diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.h b/drivers/gpu/drm/i915/display/intel_vdsc.h >> index fe4d45561253..dfb1fd38deb4 100644 >> --- a/drivers/gpu/drm/i915/display/intel_vdsc.h >> +++ b/drivers/gpu/drm/i915/display/intel_vdsc.h >> @@ -22,5 +22,6 @@ void intel_uncompressed_joiner_get_config(struct intel_crtc_state *crtc_state); >> void intel_dsc_get_config(struct intel_crtc_state *crtc_state); >> enum intel_display_power_domain >> intel_dsc_power_domain(const struct intel_crtc_state *crtc_state); >> +struct intel_crtc *intel_dsc_get_bigjoiner_secondary(const struct intel_crtc *primary_crtc); >> >> #endif /* __INTEL_VDSC_H__ */ >> -- >> 2.20.1 >> -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx