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: Sagar Ghuge <sagar.ghuge@intel.com>,
	Nanley Chery <nanley.g.chery@intel.com>,
	Xi Ruoyao <xry111@xry111.site>
Subject: [PATCH 3/4] drm/i915/fb: Check that the clear color fits within the BO
Date: Fri, 29 Nov 2024 08:50:13 +0200	[thread overview]
Message-ID: <20241129065014.8363-4-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20241129065014.8363-1-ville.syrjala@linux.intel.com>

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

Make sure the user supplied offset[] for the clear color plane
fits within the actual BO. Note that we use tile units to track
the size here. All the other color/aux planes are already
being checked correctly.

Cc: Sagar Ghuge <sagar.ghuge@intel.com>
Cc: Nanley Chery <nanley.g.chery@intel.com>
Cc: Xi Ruoyao <xry111@xry111.site>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_fb.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index e478d412785e..9f7f1b9f3275 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -1694,6 +1694,8 @@ int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer *
 		 * arithmetic related to alignment and offset calculation.
 		 */
 		if (is_gen12_ccs_cc_plane(&fb->base, i)) {
+			unsigned int end;
+
 			if (!IS_ALIGNED(fb->base.offsets[i], 64)) {
 				drm_dbg_kms(&i915->drm,
 					    "fb misaligned clear color plane %d offset (0x%x)\n",
@@ -1701,6 +1703,14 @@ int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer *
 				return -EINVAL;
 			}
 
+			if (check_add_overflow(fb->base.offsets[i], 64, &end)) {
+				drm_dbg_kms(&i915->drm,
+					    "fb bad clear color plane %d offset (0x%x)\n",
+					    i, fb->base.offsets[i]);
+				return -EINVAL;
+			}
+
+			max_size = max(max_size, DIV_ROUND_UP(end, tile_size));
 			continue;
 		}
 
-- 
2.45.2


  parent reply	other threads:[~2024-11-29  6:50 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-29  6:50 [PATCH 0/4] drm/i915/fb: Deal with Mesa clear color alignment regression Ville Syrjala
2024-11-29  6:50 ` [PATCH 1/4] drm/i915/fb: Relax clear color alignment to 64 bytes Ville Syrjala
2024-11-29 13:45   ` Xi Ruoyao
2024-11-29  6:50 ` [PATCH 2/4] drm/i915/fb: Add debug spew for misaligned CC plane Ville Syrjala
2024-11-29  6:50 ` Ville Syrjala [this message]
2024-11-29  6:50 ` [PATCH 4/4] drm/uapi/fourcc: Document the Intel clear color alignment better Ville Syrjala
2025-01-10 15:43   ` Chery, Nanley G
2025-01-13 16:38     ` Ville Syrjälä
2024-11-29  7:11 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915/fb: Deal with Mesa clear color alignment regression Patchwork
2024-11-29  7:11 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-11-29  7:27 ` ✗ i915.CI.BAT: failure " Patchwork
2024-11-29  8:45 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915/fb: Deal with Mesa clear color alignment regression (rev2) Patchwork
2024-11-29  8:45 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-11-29  8:57 ` ✓ i915.CI.BAT: success " Patchwork
2024-11-29 11:17 ` ✗ i915.CI.Full: failure " Patchwork
2025-01-07 19:44 ` [PATCH 0/4] drm/i915/fb: Deal with Mesa clear color alignment regression Souza, Jose

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=20241129065014.8363-4-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=nanley.g.chery@intel.com \
    --cc=sagar.ghuge@intel.com \
    --cc=xry111@xry111.site \
    /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