summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Davenport <ddavenport@chromium.org>2022-12-26 22:53:24 -0700
committerRodrigo Vivi <rodrigo.vivi@intel.com>2023-01-17 10:37:06 -0500
commit8565c502e7c156d190d8e6d36e443f51b257f165 (patch)
tree445ecbecfdc878e91567e58d2f34b18350990a51
parent5dc4c995db9eb45f6373a956eb1f69460e69e6d4 (diff)
downloadlinux-stable-8565c502e7c156d190d8e6d36e443f51b257f165.tar.gz
linux-stable-8565c502e7c156d190d8e6d36e443f51b257f165.tar.bz2
linux-stable-8565c502e7c156d190d8e6d36e443f51b257f165.zip
drm/i915/display: Check source height is > 0
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.I15dff7bb5a0e485c862eae61a69096caf12ef29f@changeid (cherry picked from commit 0fe76b198d482b41771a8d17b45fb726d13083cf) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
-rw-r--r--drivers/gpu/drm/i915/display/skl_universal_plane.c2
1 files changed, 1 insertions, 1 deletions
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);