dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: manasi.d.navare@intel.com, vinod.govindapillai@intel.com,
	jani.nikula@intel.com, dri-devel@lists.freedesktop.org,
	Stanislav.Lisovskiy@intel.com, jani.saarinen@intel.com
Subject: [PATCH 2/4] drm/i915: Fix intel_dp_mst_compute_link_config
Date: Thu,  1 Sep 2022 13:11:41 +0300	[thread overview]
Message-ID: <20220901101143.32316-3-stanislav.lisovskiy@intel.com> (raw)
In-Reply-To: <20220901101143.32316-1-stanislav.lisovskiy@intel.com>

We currently always exit that bpp loop because drm_dp_atomic_find_vcpi_slots
doesn't care if we actually can fit those or not.
I think that wasn't the initial intention here, especially when
we keep trying with lower bpps, we are supposed to keep trying
until we actually find some _working_ configuration, which isn't the
case here.
So added that drm_dp_mst_check here, so that we can make sure
that try all the bpps before we fail.

Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_mst.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 13abe2b2170e..c4f92edbdd08 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -60,6 +60,7 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,
 		&crtc_state->hw.adjusted_mode;
 	bool constant_n = drm_dp_has_quirk(&intel_dp->desc, DP_DPCD_QUIRK_CONSTANT_N);
 	int bpp, slots = -EINVAL;
+	int ret = 0;
 
 	mst_state = drm_atomic_get_mst_topology_state(state, &intel_dp->mst_mgr);
 	if (IS_ERR(mst_state))
@@ -85,10 +86,21 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,
 						      connector->port, crtc_state->pbn);
 		if (slots == -EDEADLK)
 			return slots;
-		if (slots >= 0)
-			break;
+		if (slots >= 0) {
+			ret = drm_dp_mst_atomic_check(state);
+			/*
+			 * If we got slots >= 0 and we can fit those based on check
+			 * then we can exit the loop. Otherwise keep trying.
+			 */
+			if (!ret)
+				break;
+		}
 	}
 
+	/* Despite slots are non-zero, we still failed the atomic check */
+	if (ret && slots >= 0)
+		slots = ret;
+
 	if (slots < 0) {
 		drm_dbg_kms(&i915->drm, "failed finding vcpi slots:%d\n",
 			    slots);
-- 
2.37.3


  parent reply	other threads:[~2022-09-01 10:11 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-01 10:11 [PATCH 0/4] Add DP MST DSC support to i915 Stanislav Lisovskiy
2022-09-01 10:11 ` [PATCH 1/4] drm: Add missing DP DSC extended capability definitions Stanislav Lisovskiy
2022-09-01 10:11 ` Stanislav Lisovskiy [this message]
2022-09-01 10:11 ` [PATCH 3/4] drm/i915: Extract drm_dp_atomic_find_vcpi_slots cycle to separate function Stanislav Lisovskiy
2022-09-04 11:37   ` Govindapillai, Vinod
2022-09-01 10:11 ` [PATCH 4/4] drm/i915: Add DSC support to MST path Stanislav Lisovskiy
2022-09-04 12:07   ` Govindapillai, Vinod
2022-09-05  5:44     ` Lisovskiy, Stanislav
  -- strict thread matches above, loose matches on Subject: below --
2022-09-13 14:14 [PATCH 0/4] Add DP MST DSC support to i915 Stanislav Lisovskiy
2022-09-13 14:14 ` [PATCH 2/4] drm/i915: Fix intel_dp_mst_compute_link_config Stanislav Lisovskiy
2022-09-05  8:57 [PATCH 0/4] Add DP MST DSC support to i915 Stanislav Lisovskiy
2022-09-05  8:57 ` [PATCH 2/4] drm/i915: Fix intel_dp_mst_compute_link_config Stanislav Lisovskiy
2022-08-29  9:58 [PATCH 0/4] Add DP MST DSC support to i915 Stanislav Lisovskiy
2022-08-29  9:58 ` [PATCH 2/4] drm/i915: Fix intel_dp_mst_compute_link_config Stanislav Lisovskiy
2022-08-29 14:24   ` Govindapillai, Vinod
2022-08-26  9:20 [PATCH 0/4] Add DP MST DSC support to i915 Stanislav Lisovskiy
2022-08-26  9:20 ` [PATCH 2/4] drm/i915: Fix intel_dp_mst_compute_link_config Stanislav Lisovskiy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220901101143.32316-3-stanislav.lisovskiy@intel.com \
    --to=stanislav.lisovskiy@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=jani.saarinen@intel.com \
    --cc=manasi.d.navare@intel.com \
    --cc=vinod.govindapillai@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).