Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CAE33B1EE2 for ; Wed, 29 Jul 2026 11:17:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785323835; cv=none; b=f0R238v2gZgnSpH7nZAfM3+6acNuLIxa6Qd7J5JTvWWxNLCTWYnfW7hBPWpO/8DNcR9YuZ0ottS6AVfS+sMIPX1wmHXSXXQ6fGRPdzHx336SQTVqDalZG6elftJtZkJsdOoij4OqEf9LXw9kq5oq+xGGZe+cGIFBkprYcVZoTl8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785323835; c=relaxed/simple; bh=6HddseDRmidq9D1Ci3Z7ss7bTsDcF7uhUORKUDMOgwY=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=hEToZwAwiOQZ7JniOQ11o6uOWTDurmCQ5bgh2AJtsbLEhbBW16xqopKoSucmDU7v9XtlMnQ4DGZeCum28p+4qMowHHOmcxaOoYbWr6kasz1O7/y/Nalhx3M6r9BmRWHq/dzgz6JlZjvkNHz7wIJuKg4AFmzDyMjF0yYt134Ahi0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FHfEKRl+; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FHfEKRl+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 307341F000E9; Wed, 29 Jul 2026 11:17:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785323833; bh=fikKGQKhBk/q4tO/nhwh82m8fj9dfyhye7uF2g9hfco=; h=Subject:To:Cc:From:Date; b=FHfEKRl++kJgGmIkdaRB6EVwWRgx8HpGI8lkzEMsb5QuMzZmLsFlSvZnCTxgUobWv uh2TamkzoA68aTNk2KHCOSjWoWUKbSikwmpDOtdILtWxXEKY+vS6lhaS9JteWihUqC dRFoHxNGAebCoXJ4wyQVRQeoVNB83LIj8p7LZZwM= Subject: FAILED: patch "[PATCH] drm/i915/vrr: require valid min/max vfreq for VRR" failed to apply to 6.1-stable tree To: jani.nikula@intel.com,ankit.k.nautiyal@intel.com,joonas.lahtinen@linux.intel.com,martin.hodo@intel.com Cc: From: Date: Wed, 29 Jul 2026 13:16:54 +0200 Message-ID: <2026072954-fiscally-stellar-5adc@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit 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 f8a9262c7a6fc2de9802e14b0228114f0333869e # git commit -s git send-email --to '' --in-reply-to '2026072954-fiscally-stellar-5adc@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f8a9262c7a6fc2de9802e14b0228114f0333869e Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Thu, 25 Jun 2026 16:10:40 +0300 Subject: [PATCH] drm/i915/vrr: require valid min/max vfreq for VRR Ensure the EDID provided min/max vfreq are valid. Most scenarios are already covered (by coincidence) through the checks in intel_vrr_is_capable() and intel_vrr_is_in_range(), but be more explicit about it. At worst, a zero min_vfreq could lead to a division by zero in intel_vrr_compute_vmax(). Discovered using AI-assisted static analysis confirmed by Intel Product Security. Reported-by: Martin Hodo Fixes: 117cd09ba528 ("drm/i915/display/dp: Compute VRR state in atomic_check") Cc: stable@vger.kernel.org # v5.12+ Cc: Ankit Nautiyal Reviewed-by: Ankit Nautiyal Link: https://patch.msgid.link/20260625131040.1051272-1-jani.nikula@intel.com Signed-off-by: Jani Nikula (cherry picked from commit 1765cf59f517b02f3b0591fe5120930d08bddeb6) Signed-off-by: Joonas Lahtinen diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c index e03b5daac5be..aa587be908f1 100644 --- a/drivers/gpu/drm/i915/display/intel_vrr.c +++ b/drivers/gpu/drm/i915/display/intel_vrr.c @@ -74,6 +74,10 @@ bool intel_vrr_is_capable(struct intel_connector *connector) return false; } + if (!info->monitor_range.min_vfreq || !info->monitor_range.max_vfreq || + info->monitor_range.min_vfreq > info->monitor_range.max_vfreq) + return false; + return info->monitor_range.max_vfreq - info->monitor_range.min_vfreq > 10; }