diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2023-12-07 10:38:21 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2023-12-11 13:41:14 +0100 |
| commit | 759f14e20891de72e676d9d738eb2c573aa15f52 (patch) | |
| tree | 903a059d802be48a018fe0bed19aa2afb08a8811 /drivers/gpu/drm/drm_edid.c | |
| parent | accel/ivpu/37xx: Fix interrupt_clear_with_0 WA initialization (diff) | |
| download | linux-759f14e20891de72e676d9d738eb2c573aa15f52.tar.xz linux-759f14e20891de72e676d9d738eb2c573aa15f52.zip | |
drm/edid: also call add modes in EDID connector update fallback
When the separate add modes call was added back in commit c533b5167c7e
("drm/edid: add separate drm_edid_connector_add_modes()"), it failed to
address drm_edid_override_connector_update(). Also call add modes there.
Reported-by: bbaa <bbaa@bbaa.fun>
Closes: https://lore.kernel.org/r/930E9B4C7D91FDFF+29b34d89-8658-4910-966a-c772f320ea03@bbaa.fun
Fixes: c533b5167c7e ("drm/edid: add separate drm_edid_connector_add_modes()")
Cc: <stable@vger.kernel.org> # v6.3+
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231207093821.2654267-1-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
| -rw-r--r-- | drivers/gpu/drm/drm_edid.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 39db08f803ea..3b4065099872 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2309,7 +2309,8 @@ int drm_edid_override_connector_update(struct drm_connector *connector) override = drm_edid_override_get(connector); if (override) { - num_modes = drm_edid_connector_update(connector, override); + if (drm_edid_connector_update(connector, override) == 0) + num_modes = drm_edid_connector_add_modes(connector); drm_edid_free(override); |