From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32FCFC64EC4 for ; Fri, 10 Mar 2023 11:38:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230094AbjCJLiO (ORCPT ); Fri, 10 Mar 2023 06:38:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230107AbjCJLiC (ORCPT ); Fri, 10 Mar 2023 06:38:02 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3074075A5A for ; Fri, 10 Mar 2023 03:38:01 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BFC4061369 for ; Fri, 10 Mar 2023 11:38:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CFECFC433EF; Fri, 10 Mar 2023 11:37:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678448280; bh=WPi6GieDeyP9pW36N3yy2lh2ANQN4I29C/YeMWv8EOM=; h=Subject:To:Cc:From:Date:From; b=Zi4kU8sS62RdFgpnZfRLDTuzjLodZLy3X+rtlr6i+ZByC7FATPBVV479EiHV9jYIR Rpm97o2EP3P9ZwM/AC4eOF/qIrHSpnbWjCktmivlfI844bU+7OEcXYRFKaC93tbllq VucGkY6hA9S5/M2VuF89rJeCVoh8t7LZu+rvgQnQ= Subject: FAILED: patch "[PATCH] drm/i915/display: Check source height is > 0" failed to apply to 6.1-stable tree To: ddavenport@chromium.org, ville.syrjala@linux.intel.com Cc: From: Date: Fri, 10 Mar 2023 12:37:49 +0100 Message-ID: <1678448269232217@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 . 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 # git commit -s git send-email --to '' --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 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 Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20221226225246.1.I15dff7bb5a0e485c862eae61a69096caf12ef29f@changeid 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);