intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Manasi Navare <manasi.d.navare@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH] drm/i915/display: Fix shared dpll mismatch for bigjoiner slave
Date: Wed, 23 Jun 2021 12:04:55 -0700	[thread overview]
Message-ID: <20210623190455.29340-1-manasi.d.navare@intel.com> (raw)

Currently when we do the HW state readout, we dont set the shared dpll to NULL
for the bigjoiner slave which should not have a DPLL assigned. So it has
some garbage while the HW state readout is NULL. So explicitly reset
the shared dpll for bigjoiner slave pipe.

Bug: https://gitlab.freedesktop.org/drm/intel/-/issues/3465
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 6be1b31af07b..606b9107d1cf 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -8971,8 +8971,10 @@ verify_crtc_state(struct intel_crtc *crtc,
 			"(expected %i, found %i)\n",
 			new_crtc_state->hw.active, crtc->active);
 
-	if (new_crtc_state->bigjoiner_slave)
+	if (new_crtc_state->bigjoiner_slave) {
+		pipe_config->shared_dpll = NULL;
 		master = new_crtc_state->bigjoiner_linked_crtc;
+	}
 
 	for_each_encoder_on_crtc(dev, &master->base, encoder) {
 		enum pipe pipe;
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

             reply	other threads:[~2021-06-23 18:56 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-23 19:04 Manasi Navare [this message]
2021-06-23 19:09 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: Fix shared dpll mismatch for bigjoiner slave Patchwork
2021-06-23 19:39 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-06-23 21:53 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-07-14 22:34 [Intel-gfx] [PATCH] " Manasi Navare
2021-07-19  6:17 ` Nautiyal, Ankit K
2021-07-19 18:58   ` Navare, Manasi
2021-07-20  7:23     ` Nautiyal, Ankit K
2021-07-21 17:42       ` Navare, Manasi
2021-08-10 13:19 ` Jani Nikula

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=20210623190455.29340-1-manasi.d.navare@intel.com \
    --to=manasi.d.navare@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /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).