From mboxrd@z Thu Jan 1 00:00:00 1970 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 2F24E161906; Wed, 27 Mar 2024 12:19:56 +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=1711541996; cv=none; b=LWx42bmO+f8NtziqujATrxnlxafOEw3tUNlRHAd3AJLu2lrab1J4eS9Zt45vY+i27epp+abwOPmj0DfxXSzsrr/gJiu46Fyf3lMZeCghaBRyVS+1+xewBsMG4ncB7olM+EEffDfYbncP2rurSSm4zfnlTmMxDtyIXA4UynHkHVo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541996; c=relaxed/simple; bh=yqL9JHiyLlAHWOXi5y2P5i/uFb9WzbZY++/3tLeDO4s=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Y0N2D7jsnrRG3qzUJmDRn8Za8OVyR1zxl2vT2G+bg7SCIvymzSfEpapUklhiZcSnHcciEQfdqpO2xF+cTUY3x9v0vdUap35fEcWubU0skKgwDBuKiKsLf/Q4dFjFmuGKGM0fo7WXHRVuY3IprdktC8yN3+DqXUzD8tEqKkkvnpw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bznOb6H0; 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="bznOb6H0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 599F3C43394; Wed, 27 Mar 2024 12:19:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711541996; bh=yqL9JHiyLlAHWOXi5y2P5i/uFb9WzbZY++/3tLeDO4s=; h=From:To:Cc:Subject:Date:From; b=bznOb6H0uy2sF9NvX5XptJ2WYaAWomd+fyS+R3yZVz4ti2OWzhvbdxHQZ7/dzUE69 0O9WUNPO+7mkferuq72EwA7bpWHN/MRQIhjidutL8PsRvgDFCkCAQL1PUlG5v78+Bt VmgQifvbQpOPi6M8d+1iYg2hU488gvmeKwp/CVTaVaUZn+O5yyAeW0EFFlL0Hs4JbF q/NzJcbkfheUyEDswi8ib9bu/QAOcjA7/Te7sNTfKhLmym45XxANqjLhc5QIt12lwe TxsgV7DQqd+YntvZwBab/tcWjkMHDC0BkUQuiqqD8whpjzkISb1V68tKxfTH1bT/kS IYaEy8KRiW7Kw== From: Sasha Levin To: stable@vger.kernel.org, jani.nikula@intel.com Cc: Adrien Grassein , Thomas Zimmermann , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: FAILED: Patch "drm/bridge: lt8912b: do not return negative values from .get_modes()" failed to apply to 5.10-stable tree Date: Wed, 27 Mar 2024 08:19:54 -0400 Message-ID: <20240327121954.2835574-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-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 ------------------ original commit in Linus's tree ------------------ >From 171b711b26cce208bb628526b1b368aeec7b6fa4 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Fri, 8 Mar 2024 18:03:42 +0200 Subject: [PATCH] drm/bridge: lt8912b: do not return negative values from .get_modes() The .get_modes() hooks aren't supposed to return negative error codes. Return 0 for no modes, whatever the reason. Cc: Adrien Grassein Cc: stable@vger.kernel.org Acked-by: Thomas Zimmermann Link: https://patchwork.freedesktop.org/patch/msgid/dcdddcbcb64b6f6cdc55022ee50c10dee8ddbc3d.1709913674.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- drivers/gpu/drm/bridge/lontium-lt8912b.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/bridge/lontium-lt8912b.c b/drivers/gpu/drm/bridge/lontium-lt8912b.c index e7c4bef74aa46..4b2ae27f0a57f 100644 --- a/drivers/gpu/drm/bridge/lontium-lt8912b.c +++ b/drivers/gpu/drm/bridge/lontium-lt8912b.c @@ -441,23 +441,21 @@ lt8912_connector_mode_valid(struct drm_connector *connector, static int lt8912_connector_get_modes(struct drm_connector *connector) { const struct drm_edid *drm_edid; - int ret = -1; - int num = 0; struct lt8912 *lt = connector_to_lt8912(connector); u32 bus_format = MEDIA_BUS_FMT_RGB888_1X24; + int ret, num; drm_edid = drm_bridge_edid_read(lt->hdmi_port, connector); drm_edid_connector_update(connector, drm_edid); - if (drm_edid) { - num = drm_edid_connector_add_modes(connector); - } else { - return ret; - } + if (!drm_edid) + return 0; + + num = drm_edid_connector_add_modes(connector); ret = drm_display_info_set_bus_formats(&connector->display_info, &bus_format, 1); - if (ret) - num = ret; + if (ret < 0) + num = 0; drm_edid_free(drm_edid); return num; -- 2.43.0