diff options
author | Dave Airlie <airlied@redhat.com> | 2024-03-19 14:36:06 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2024-03-19 14:36:15 +1000 |
commit | 02ac43711111b9e36dbbecfe85bfd1dbfa2b49bb (patch) | |
tree | 1a0a3ba280fa6fb67dbbbb1247821c3bec8cc20e /drivers/gpu/drm/vc4/vc4_hdmi.c | |
parent | 341f7081587da6d66b9b47e76c0e2ebd2350624f (diff) | |
parent | 9dd81b2e1ec72a3759f8d6bb6e9cbef93aab6227 (diff) |
Merge tag 'drm-misc-next-fixes-2024-03-14' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
Short summary of fixes pull:
probe-helper:
- never return negative values from .get_modes() plus driver fixes
nouveau:
- clear bo resource bus after eviction
- documentation fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240314082833.GA8761@localhost.localdomain
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_hdmi.c')
-rw-r--r-- | drivers/gpu/drm/vc4/vc4_hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 34f807ed1c31..d8751ea20303 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -509,7 +509,7 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector) edid = drm_get_edid(connector, vc4_hdmi->ddc); cec_s_phys_addr_from_edid(vc4_hdmi->cec_adap, edid); if (!edid) - return -ENODEV; + return 0; drm_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); |