From nobody Mon May 13 01:47:18 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 03EF1158D97; Wed, 27 Mar 2024 12:17:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541840; cv=none; b=VOGn3+PGz1trq4FN9FkEuQ6AwHjMdayrVoHvX4/R7Tc1+DTekdCcOGU93cd4FfqAokXM32r6/XM4599LQPEpybN2o8F6HC0968rewvkyU03MzFJXEXj3MKUYS+zco1/2AzbDRWMBQ0tL+02UHoqoF5QKkfTFjq1qoyimVwR1NKQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541840; c=relaxed/simple; bh=O/PabvBnYeiHwfcOh16pSl7bJkgOld9zUkMMbdOMcEs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Zv7+uG+NiWaERl9bp5f4hTEy98nQjrYqd2dQKo5+ETSca5YPc/jdcB2KCz6NYkpXllLAcK8QSV8taqMvFMngb/Cr3V897FSCg0a7tzIk3OOTwJiRua6mB8Ly7kfSGFX+baUJdTUqirFFfgs8HZQb2e8JAn57hhGdPb9QIiCTDLk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cT4CtCbh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cT4CtCbh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 461BEC433C7; Wed, 27 Mar 2024 12:17:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711541839; bh=O/PabvBnYeiHwfcOh16pSl7bJkgOld9zUkMMbdOMcEs=; h=From:To:Cc:Subject:Date:From; b=cT4CtCbh6+3RHbwwb+x99lvTjaA8fNhIwOsvIqkQAz13WrNgcW+ptJw9MWuugxhDY 4WSvA5C/KT7URwH2vw/zqAD/pSIKoOTEcX3Pf5Vrbt/TobO4pRRxGgtI7vKqmmCXpC 1jAQ8jCQUFLWjV5dI20ZNwh4WYyc5Wjmj5ju1h7QaAwd2iMkr5+nj40q1OFo6OAiZO xoIs3y8pkldmVGaZo2J46NxpiSoOvrjfRy7O9GuqGbOBR19iKYzd+m/VY/F2rLwMv1 PIbeogsoSQCs1MjOdJ4yDs86jun4Pna2fIsK4l1f2jby/TSyRbQdfLZiLhNPgtcbWP PqabMtx+tdo8Q== From: Sasha Levin To: stable@vger.kernel.org, jani.nikula@intel.com Cc: Thomas Zimmermann , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: FAILED: Patch "drm/probe-helper: warn about negative .get_modes()" failed to apply to 5.15-stable tree Date: Wed, 27 Mar 2024 08:17:18 -0400 Message-ID: <20240327121718.2833433-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The patch below does not apply to the 5.15-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 . Thanks, Sasha Acked-by: Thomas Zimmermann ------------------ original commit in Linus's tree ------------------ From 7af03e688792293ba33149fb8df619a8dff90e80 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Fri, 8 Mar 2024 18:03:39 +0200 Subject: [PATCH] drm/probe-helper: warn about negative .get_modes() The .get_modes() callback is supposed to return the number of modes, never a negative error code. If a negative value is returned, it'll just be interpreted as a negative count, and added to previous calculations. Document the rules, but handle the negative values gracefully with an error message. Cc: stable@vger.kernel.org Acked-by: Thomas Zimmermann Link: https://patchwork.freedesktop.org/patch/msgid/50208c866facc33226a3c77= b82bb96aeef8ef310.1709913674.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- drivers/gpu/drm/drm_probe_helper.c | 7 +++++++ include/drm/drm_modeset_helper_vtables.h | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe= _helper.c index 19ecb749704be..75f84753f6ee3 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -422,6 +422,13 @@ static int drm_helper_probe_get_modes(struct drm_conne= ctor *connector) =20 count =3D connector_funcs->get_modes(connector); =20 + /* The .get_modes() callback should not return negative values. */ + if (count < 0) { + drm_err(connector->dev, ".get_modes() returned %pe\n", + ERR_PTR(count)); + count =3D 0; + } + /* * Fallback for when DDC probe failed in drm_get_edid() and thus skipped * override/firmware EDID. diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_mod= eset_helper_vtables.h index 881b03e4dc288..9ed42469540eb 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -898,7 +898,8 @@ struct drm_connector_helper_funcs { * * RETURNS: * - * The number of modes added by calling drm_mode_probed_add(). + * The number of modes added by calling drm_mode_probed_add(). Return 0 + * on failures (no modes) instead of negative error codes. */ int (*get_modes)(struct drm_connector *connector); =20 --=20 2.43.0