mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-27 17:21:34 +00:00
63 lines
2 KiB
Diff
63 lines
2 KiB
Diff
From ea694857e0d17d18249c027d2d33067fed690d54 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Sun, 16 Dec 2018 11:38:43 +0100
|
|
Subject: [PATCH 47/91] drm: dw-hdmi: move dw_hdmi_connector_detect()
|
|
|
|
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 fcb2eeb..35124ad 100644
|
|
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
|
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
|
@@ -1992,21 +1992,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)
|
|
{
|
|
@@ -2037,6 +2022,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);
|
|
--
|
|
2.7.4
|
|
|