* [PATCH] drm: bridge/dw_hdmi: Return num_modes in dw_hdmi_connector_get_modes
@ 2015-06-04 18:04 Doug Anderson
2015-06-05 10:02 ` Thierry Reding
0 siblings, 1 reply; 2+ messages in thread
From: Doug Anderson @ 2015-06-04 18:04 UTC (permalink / raw)
To: Philipp Zabel, Russell King, Thierry Reding
Cc: Doug Anderson, airlied, andy.yan, ykk, fabio.estevam, dri-devel,
linux-kernel
The dw_hdmi_connector_get_modes() function accidentally forgets to
return the number of modes it added, although it has this information
stored in a local variable. Let's fix that.
Without this fix, drm_helper_probe_single_connector_modes_merge_bits()
could get confused and always call drm_add_modes_noedid(). That's not
right.
Signed-off-by: Doug Anderson <dianders@chromium.org>
---
drivers/gpu/drm/bridge/dw_hdmi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c
index 594f84c..816d104 100644
--- a/drivers/gpu/drm/bridge/dw_hdmi.c
+++ b/drivers/gpu/drm/bridge/dw_hdmi.c
@@ -1395,7 +1395,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector)
struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi,
connector);
struct edid *edid;
- int ret;
+ int ret = 0;
if (!hdmi->ddc)
return 0;
@@ -1412,7 +1412,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector)
dev_dbg(hdmi->dev, "failed to get edid\n");
}
- return 0;
+ return ret;
}
static enum drm_mode_status
--
2.2.0.rc0.207.ga3a616c
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm: bridge/dw_hdmi: Return num_modes in dw_hdmi_connector_get_modes
2015-06-04 18:04 [PATCH] drm: bridge/dw_hdmi: Return num_modes in dw_hdmi_connector_get_modes Doug Anderson
@ 2015-06-05 10:02 ` Thierry Reding
0 siblings, 0 replies; 2+ messages in thread
From: Thierry Reding @ 2015-06-05 10:02 UTC (permalink / raw)
To: Doug Anderson
Cc: Philipp Zabel, Russell King, airlied, andy.yan, ykk,
fabio.estevam, dri-devel, linux-kernel
On Thu, Jun 04, 2015 at 11:04:36AM -0700, Doug Anderson wrote:
> The dw_hdmi_connector_get_modes() function accidentally forgets to
> return the number of modes it added, although it has this information
> stored in a local variable. Let's fix that.
>
> Without this fix, drm_helper_probe_single_connector_modes_merge_bits()
> could get confused and always call drm_add_modes_noedid(). That's not
> right.
>
> Signed-off-by: Doug Anderson <dianders@chromium.org>
> ---
> drivers/gpu/drm/bridge/dw_hdmi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.
Thierry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-05 10:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-04 18:04 [PATCH] drm: bridge/dw_hdmi: Return num_modes in dw_hdmi_connector_get_modes Doug Anderson
2015-06-05 10:02 ` Thierry Reding
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox