Revert "drm/bridge: lt8912b: Register and attach our DSI device at probe"

From: Max Krummenacher <[email protected]>

This reverts commit ef4a40953c8076626875ff91c41e210fcee7a6fd.

The commit was applied to make further commits apply cleanly, but the commit depends on other commits in the same patchset. I.e. the controlling DSI host would need a change too. Thus one would need to backport the full patchset changing the DSI hosts and all downstream DSI device drivers.

Revert the commit and fix up the conflicts with the backported fixes to the lt8912b driver.

Conflicts:
drivers/gpu/drm/bridge/lontium-lt8912b.c

---
 drivers/gpu/drm/bridge/lontium-lt8912b.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

index 6891863ed5104..e16b0fc0cda0f 100644
@@ -571,6 +571,10 @@ static int lt8912_bridge_attach(struct drm_bridge *bridge,
 	if (ret)
 		goto error;
 
+	ret = lt8912_attach_dsi(lt);
+	if (ret)
+		goto error;
+
 	return 0;
 
 error:

@@ -726,15 +730,8 @@ static int lt8912_probe(struct i2c_client *client,
 
 	drm_bridge_add(&lt->bridge);
 
-	ret = lt8912_attach_dsi(lt);
-	if (ret)
-		goto err_attach;
-
 	return 0;
 
-err_attach:
-	drm_bridge_remove(&lt->bridge);
-	lt8912_free_i2c(lt);
 err_i2c:
 	lt8912_put_dt(lt);
 err_dt_parse:

2.42.0

No need for the "conflicts" section...

now queued up, thanks.

greg k-h

This is a note to let you know that I've just added the patch titled

Revert "drm/bridge: lt8912b: Register and attach our DSI device at probe"

to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
revert-drm-bridge-lt8912b-register-and-attach-our-dsi-device-at-probe.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From [email protected] Mon Mar 4 11:51:26 2024
From: [email protected]
Date: Wed, 28 Feb 2024 15:59:45 +0100
Subject: Revert "drm/bridge: lt8912b: Register and attach our DSI device at probe"
To: [email protected]
Cc: [email protected], [email protected], [email protected], [email protected], [email protected], Max Krummenacher <[email protected]>
Message-ID: <[email protected]>

From: Max Krummenacher <[email protected]>

This reverts commit ef4a40953c8076626875ff91c41e210fcee7a6fd which is commit d89078c37b10f05fa4f4791b71db2572db361b68 upstream.

The commit was applied to make further commits apply cleanly, but the commit depends on other commits in the same patchset. I.e. the controlling DSI host would need a change too. Thus one would need to backport the full patchset changing the DSI hosts and all downstream DSI device drivers.

Revert the commit and fix up the conflicts with the backported fixes to the lt8912b driver.

---
 drivers/gpu/drm/bridge/lontium-lt8912b.c |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

@@ -571,6 +571,10 @@ static int lt8912_bridge_attach(struct d
 	if (ret)
 		goto error;
 
+	ret = lt8912_attach_dsi(lt);
+	if (ret)
+		goto error;
+
 	return 0;
 
 error:

@@ -726,15 +730,8 @@ static int lt8912_probe(struct i2c_clien
 
 	drm_bridge_add(&lt->bridge);
 
-	ret = lt8912_attach_dsi(lt);
-	if (ret)
-		goto err_attach;
-
 	return 0;
 
-err_attach:
-	drm_bridge_remove(&lt->bridge);
-	lt8912_free_i2c(lt);
 err_i2c:
 	lt8912_put_dt(lt);
 err_dt_parse:

Patches currently in stable-queue which might be from [email protected] are

queue-5.15/revert-drm-bridge-lt8912b-register-and-attach-our-dsi-device-at-probe.patch