Skip to contentSkip to conversation

drm/bridge: lt9611: Consolidate detection logic

RFC PATCH In review John Stultz 2 participants 3 messages Apr 30, 2022 – May 2, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/2 drm/bridge: lt9611: Consolidate detection logic

This patch simply consolidates the duplicated detection functionality in the driver.

Cc Yongqin Liu <[email protected]>
Cc Amit Pundir <[email protected]>
Cc Peter Collingbourne <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Robert Foss <[email protected]>
---
 drivers/gpu/drm/bridge/lontium-lt9611.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)
drivers/gpu/drm/bridge/lontium-lt9611.c +8 -14
index 63df2e8a8abc..bf66af668f61 100644
@@ -578,10 +578,8 @@ static struct lt9611_mode *lt9611_find_mode(const struct drm_display_mode *mode)
 }
 
 /* connector funcs */
-static enum drm_connector_status
-lt9611_connector_detect(struct drm_connector *connector, bool force)
+static enum drm_connector_status __lt9611_detect(struct lt9611 *lt9611)
 {
-	struct lt9611 *lt9611 = connector_to_lt9611(connector);
 	unsigned int reg_val = 0;
 	int connected = 0;
 
@@ -594,6 +592,12 @@ lt9611_connector_detect(struct drm_connector *connector, bool force)
 	return lt9611->status;
 }
 
+static enum drm_connector_status
+lt9611_connector_detect(struct drm_connector *connector, bool force)
+{
+	return __lt9611_detect(connector_to_lt9611(connector));
+}
+
 static int lt9611_read_edid(struct lt9611 *lt9611)
 {
 	unsigned int temp;
@@ -887,17 +891,7 @@ static void lt9611_bridge_mode_set(struct drm_bridge *bridge,
 
 static enum drm_connector_status lt9611_bridge_detect(struct drm_bridge *bridge)
 {
-	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
-	unsigned int reg_val = 0;
-	int connected;
-
-	regmap_read(lt9611->regmap, 0x825e, &reg_val);
-	connected  = reg_val & BIT(0);
-
-	lt9611->status = connected ?  connector_status_connected :
-				connector_status_disconnected;
-
-	return lt9611->status;
+	return __lt9611_detect(bridge_to_lt9611(bridge));
 }
 
 static struct edid *lt9611_bridge_get_edid(struct drm_bridge *bridge,
Signature · 1 line
2.36.0.464.gb9c8b46e94-goog
#1 lore raw

RFC PATCH 2/2 drm/bridge: lt9611: Use both bits for HDMI sensing

In commit 19cf41b64e3b ("lontium-lt9611: check a different register bit for HDMI sensing"), the bit flag used to detect HDMI cable connect was switched from BIT(2) to BIT(0) to improve compatibility with some monitors that didn't seem to set BIT(2).

However, with that change, I've seen occasional issues where the detection failed, because BIT(2) was set, but not BIT(0).

Unfortunately, as I understand it, the bits and their function was never clearly documented. So lets instead check both (BIT(2) | BIT(0)) when checking the register.

Cc Yongqin Liu <[email protected]>
Cc Amit Pundir <[email protected]>
Cc Peter Collingbourne <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Robert Foss <[email protected]>
---
 drivers/gpu/drm/bridge/lontium-lt9611.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/lontium-lt9611.c +1 -1
index bf66af668f61..a11604a56e08 100644
@@ -584,7 +584,7 @@ static enum drm_connector_status __lt9611_detect(struct lt9611 *lt9611)
 	int connected = 0;
 
 	regmap_read(lt9611->regmap, 0x825e, &reg_val);
-	connected  = (reg_val & BIT(0));
+	connected  = (reg_val & (BIT(2) | BIT(0)));
 
 	lt9611->status = connected ?  connector_status_connected :
 				connector_status_disconnected;
Signature · 1 line
2.36.0.464.gb9c8b46e94-goog
Reviewed-by on v1 1/2
#2 lore raw
In reply to John Stultz
Quoted 54 lines · John Stultz

This patch simply consolidates the duplicated detection functionality in the driver.

Cc Yongqin Liu <[email protected]>
Cc Amit Pundir <[email protected]>
Cc Peter Collingbourne <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Robert Foss <[email protected]>
---
 drivers/gpu/drm/bridge/lontium-lt9611.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)
drivers/gpu/drm/bridge/lontium-lt9611.c +7 -8
index 63df2e8a8abc..bf66af668f61 100644
@@ -578,10 +578,8 @@ static struct lt9611_mode *lt9611_find_mode(const struct drm_display_mode *mode)
 }
 
 /* connector funcs */
-static enum drm_connector_status
-lt9611_connector_detect(struct drm_connector *connector, bool force)
+static enum drm_connector_status __lt9611_detect(struct lt9611 *lt9611)
 {
-       struct lt9611 *lt9611 = connector_to_lt9611(connector);
        unsigned int reg_val = 0;
        int connected = 0;
 
@@ -594,6 +592,12 @@ lt9611_connector_detect(struct drm_connector *connector, bool force)
        return lt9611->status;
 }
 
+static enum drm_connector_status
+lt9611_connector_detect(struct drm_connector *connector, bool force)
+{
+       return __lt9611_detect(connector_to_lt9611(connector));
+}
+
 static int lt9611_read_edid(struct lt9611 *lt9611)
 {
        unsigned int temp;
@@ -887,17 +891,7 @@ static void lt9611_bridge_mode_set(struct drm_bridge *bridge,
 
 static enum drm_connector_status lt9611_bridge_detect(struct drm_bridge *bridge)
 {
-       struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
-       unsigned int reg_val = 0;
-       int connected;
-
-       regmap_read(lt9611->regmap, 0x825e, &reg_val);

drivers/gpu/drm/bridge/lontium-lt9611.c static void lt9611_bridge_mode_set(struct drm_bridge *bridge, · line 897

Quoted 10 lines
drivers/gpu/drm/bridge/lontium-lt9611.c +1 -6
-       connected  = reg_val & BIT(0);
-
-       lt9611->status = connected ?  connector_status_connected :
-                               connector_status_disconnected;
-
-       return lt9611->status;
+       return __lt9611_detect(bridge_to_lt9611(bridge));
 }
 
 static struct edid *lt9611_bridge_get_edid(struct drm_bridge *bridge,

I think this looks good. Thank John!