| Message ID | 20231207093821.2654267-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/edid: also call add modes in EDID connector update fallback | expand |
On Thu, Dec 07, 2023 at 11:38:21AM +0200, Jani Nikula wrote: > 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> > --- > drivers/gpu/drm/drm_edid.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index cb4031d5dcbb..69c68804023f 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -2311,7 +2311,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); > > -- > 2.39.2
On Fri, 08 Dec 2023, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote: > On Thu, Dec 07, 2023 at 11:38:21AM +0200, Jani Nikula wrote: >> 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> Thanks, pushed to drm-misc-fixes. BR, Jani. > >> --- >> drivers/gpu/drm/drm_edid.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c >> index cb4031d5dcbb..69c68804023f 100644 >> --- a/drivers/gpu/drm/drm_edid.c >> +++ b/drivers/gpu/drm/drm_edid.c >> @@ -2311,7 +2311,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); >> >> -- >> 2.39.2
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index cb4031d5dcbb..69c68804023f 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2311,7 +2311,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);
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> --- drivers/gpu/drm/drm_edid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)