The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 0fe76b198d482b41771a8d17b45fb726d13083cf # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '1678448269232217@kroah.com' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
0fe76b198d48 ("drm/i915/display: Check source height is > 0")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0fe76b198d482b41771a8d17b45fb726d13083cf Mon Sep 17 00:00:00 2001 From: Drew Davenport ddavenport@chromium.org Date: Mon, 26 Dec 2022 22:53:24 -0700 Subject: [PATCH] drm/i915/display: Check source height is > 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
The error message suggests that the height of the src rect must be at least 1. Reject source with height of 0.
Cc: stable@vger.kernel.org Signed-off-by: Drew Davenport ddavenport@chromium.org Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com Link: https://patchwork.freedesktop.org/patch/msgid/20221226225246.1.I15dff7bb5a0e...
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c index 76490cc59d8f..7d07fa3123ec 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c @@ -1627,7 +1627,7 @@ static int skl_check_main_surface(struct intel_plane_state *plane_state) u32 offset; int ret;
- if (w > max_width || w < min_width || h > max_height) { + if (w > max_width || w < min_width || h > max_height || h < 1) { drm_dbg_kms(&dev_priv->drm, "requested Y/RGB source size %dx%d outside limits (min: %dx1 max: %dx%d)\n", w, h, min_width, max_width, max_height);