On 01/09/2019 18:14, Jonas Karlman wrote:
Move dw_hdmi_connector_detect() it will call dw_hdmi_connector_update_edid().
Signed-off-by: Jonas Karlman jonas@kwiboo.se
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 8ab214dc5ae7..91d86ddd6624 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -2156,21 +2156,6 @@ static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi) hdmi->rxsense); }
-static enum drm_connector_status -dw_hdmi_connector_detect(struct drm_connector *connector, bool force) -{
- struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi,
connector);- mutex_lock(&hdmi->mutex);
- hdmi->force = DRM_FORCE_UNSPECIFIED;
- dw_hdmi_update_power(hdmi);
- dw_hdmi_update_phy_mask(hdmi);
- mutex_unlock(&hdmi->mutex);
- return hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data);
-}
static int dw_hdmi_connector_update_edid(struct drm_connector *connector, bool add_modes) { @@ -2201,6 +2186,21 @@ static int dw_hdmi_connector_update_edid(struct drm_connector *connector, return ret; }
+static enum drm_connector_status +dw_hdmi_connector_detect(struct drm_connector *connector, bool force) +{
- struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi,
connector);- mutex_lock(&hdmi->mutex);
- hdmi->force = DRM_FORCE_UNSPECIFIED;
- dw_hdmi_update_power(hdmi);
- dw_hdmi_update_phy_mask(hdmi);
- mutex_unlock(&hdmi->mutex);
- return hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data);
+}
static int dw_hdmi_connector_get_modes(struct drm_connector *connector) { return dw_hdmi_connector_update_edid(connector, true);
Reviewed-by: Neil Armstrong narmstrong@baylibre.com