Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: kernel test robot <oliver.sang@intel.com>
Subject: [Intel-gfx] [PATCH v2 01/13] drm/i915: Avoid negative shift due to bigjoiner_pipes==0
Date: Wed, 23 Feb 2022 15:13:03 +0200	[thread overview]
Message-ID: <20220223131315.18016-2-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20220223131315.18016-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

bigjoiner_pipes==0 leads bigjoiner_master_pipe() to
do BIT(ffs(0)-1) which is undefined behaviour. The code should
actually still work fine since the only place we provoke
that is intel_crtc_bigjoiner_slave_pipes() and it'll bitwise
AND the result with 0, so doesn't really matter what we get
out of bigjoiner_master_pipe(). But best not provoke undefined
behaviour anyway.

Reported-by: kernel test robot <oliver.sang@intel.com>
Fixes: a6e7a006f5d5 ("drm/i915: Change bigjoiner state tracking to use the pipe bitmask")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 80b19c304c43..f3f5f11a5abf 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -346,7 +346,10 @@ static enum pipe bigjoiner_master_pipe(const struct intel_crtc_state *crtc_state
 
 u8 intel_crtc_bigjoiner_slave_pipes(const struct intel_crtc_state *crtc_state)
 {
-	return crtc_state->bigjoiner_pipes & ~BIT(bigjoiner_master_pipe(crtc_state));
+	if (crtc_state->bigjoiner_pipes)
+		return crtc_state->bigjoiner_pipes & ~BIT(bigjoiner_master_pipe(crtc_state));
+	else
+		return 0;
 }
 
 bool intel_crtc_is_bigjoiner_slave(const struct intel_crtc_state *crtc_state)
-- 
2.34.1


  reply	other threads:[~2022-02-23 13:13 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-23 13:13 [Intel-gfx] [PATCH v2 00/13] drm/i915: Move bigjoiner refactoring Ville Syrjala
2022-02-23 13:13 ` Ville Syrjala [this message]
2022-02-23 19:54   ` [Intel-gfx] [PATCH v2 01/13] drm/i915: Avoid negative shift due to bigjoiner_pipes==0 Navare, Manasi
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 02/13] drm/i915: Fix cursor coordinates on bigjoiner slave Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 03/13] drm/i915: Remove nop bigjoiner state copy Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 04/13] drm/i915: Rename variables in intel_crtc_compute_config() Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 05/13] drm/i915: Extract intel_splitter_adjust_timings() Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 06/13] drm/i915: Extract intel_bigjoiner_adjust_timings() Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 07/13] drm/i915: Extract intel_crtc_compute_pipe_src() Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 08/13] drm/i915: Extract intel_crtc_compute_pipe_mode() Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 09/13] drm/i915: Fix MSO vs. bigjoiner timings confusion Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 10/13] drm/i915: Start tracking PIPESRC as a drm_rect Ville Syrjala
2022-03-03 22:20   ` Navare, Manasi
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 11/13] drm/i915: Eliminate bigjoiner boolean Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 12/13] drm/i915: Use bigjoiner_pipes more Ville Syrjala
2022-02-23 20:00   ` Navare, Manasi
2022-02-24 10:35     ` Ville Syrjälä
2022-03-03 22:29       ` Navare, Manasi
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 13/13] drm/i915: Make the PIPESC rect relative to the entire bigjoiner area Ville Syrjala
2022-03-03 22:41   ` Navare, Manasi
2022-03-04 15:10     ` Ville Syrjälä
2022-03-10  0:29       ` Navare, Manasi
2022-02-24  5:45 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Move bigjoiner refactoring (rev2) Patchwork
2022-02-24 17:20 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork

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=20220223131315.18016-2-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=oliver.sang@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