From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org, jani.nikula@intel.com,
Adrien Grassein <adrien.grassein@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH 4/8] drm/bridge: lt8912b: do not return negative values from .get_modes()
Date: Fri, 8 Mar 2024 18:03:42 +0200 [thread overview]
Message-ID: <dcdddcbcb64b6f6cdc55022ee50c10dee8ddbc3d.1709913674.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1709913674.git.jani.nikula@intel.com>
The .get_modes() hooks aren't supposed to return negative error
codes. Return 0 for no modes, whatever the reason.
Cc: Adrien Grassein <adrien.grassein@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
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 e7c4bef74aa4..4b2ae27f0a57 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.39.2
next prev parent reply other threads:[~2024-03-08 16:04 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-08 16:03 [PATCH 0/8] drm: fix .get_modes() return values Jani Nikula
2024-03-08 16:03 ` [PATCH 1/8] drm/probe-helper: warn about negative .get_modes() Jani Nikula
2024-03-08 16:03 ` [PATCH 2/8] drm/panel: do not return negative error codes from drm_panel_get_modes() Jani Nikula
2024-03-08 16:52 ` Jessica Zhang
2024-03-11 8:23 ` Neil Armstrong
2024-03-08 16:03 ` [PATCH 3/8] drm/exynos: do not return negative values from .get_modes() Jani Nikula
2024-03-08 16:03 ` Jani Nikula [this message]
2024-03-08 16:03 ` [PATCH 5/8] drm/imx/ipuv3: " Jani Nikula
2024-03-08 16:41 ` Philipp Zabel
2024-03-08 16:03 ` [PATCH 6/8] drm/vc4: hdmi: " Jani Nikula
2024-03-08 16:06 ` Maxime Ripard
2024-03-08 16:03 ` [PATCH 7/8] drm/bridge: lt9611uxc: use int for holding number of modes Jani Nikula
2024-03-11 8:28 ` Neil Armstrong
2024-03-11 9:18 ` Dmitry Baryshkov
2024-03-08 16:03 ` [PATCH 8/8] drm/exynos: simplify the return value handling in exynos_dp_get_modes() Jani Nikula
2024-03-08 16:24 ` [PATCH 0/8] drm: fix .get_modes() return values Thomas Zimmermann
2024-03-13 11:47 ` Jani Nikula
2024-03-08 18:25 ` ✗ Fi.CI.SPARSE: warning for " Patchwork
2024-03-08 18:30 ` ✗ Fi.CI.BAT: failure " Patchwork
2024-03-12 0:28 ` ✗ Fi.CI.SPARSE: warning for drm: fix .get_modes() return values (rev2) Patchwork
2024-03-12 0:45 ` ✗ Fi.CI.BAT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dcdddcbcb64b6f6cdc55022ee50c10dee8ddbc3d.1709913674.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=adrien.grassein@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox