Skip to content

Commit

Permalink
drm/bridge: lt8912b: Fix bridge_detach
Browse files Browse the repository at this point in the history
The driver calls lt8912_bridge_detach() from its lt8912_remove()
function. As the DRM core detaches bridges automatically, this leads to
calling lt8912_bridge_detach() twice. The code probably has tried to
manage the double-call with the 'is_attached' variable, but the driver
never sets the variable to false, so its of no help.

Fix the issue by dropping the call to lt8912_bridge_detach() from
lt8912_remove(), as the DRM core will handle the detach call for us,
and also drop the useless is_attached field.

Fixes: 30e2ae9 ("drm/bridge: Introduce LT8912B DSI to HDMI bridge")
Signed-off-by: Tomi Valkeinen <[email protected]>
Reviewed-by: Robert Foss <[email protected]>
Signed-off-by: Robert Foss <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
  • Loading branch information
tomba authored and robertfoss committed Sep 5, 2023
1 parent d0375f6 commit 941882a
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions drivers/gpu/drm/bridge/lontium-lt8912b.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ struct lt8912 {

u8 data_lanes;
bool is_power_on;
bool is_attached;
};

static int lt8912_write_init_config(struct lt8912 *lt)
Expand Down Expand Up @@ -575,8 +574,6 @@ static int lt8912_bridge_attach(struct drm_bridge *bridge,
if (ret)
goto error;

lt->is_attached = true;

return 0;

error:
Expand All @@ -588,15 +585,13 @@ static void lt8912_bridge_detach(struct drm_bridge *bridge)
{
struct lt8912 *lt = bridge_to_lt8912(bridge);

if (lt->is_attached) {
lt8912_hard_power_off(lt);
lt8912_hard_power_off(lt);

if (lt->hdmi_port->ops & DRM_BRIDGE_OP_HPD)
drm_bridge_hpd_disable(lt->hdmi_port);
if (lt->hdmi_port->ops & DRM_BRIDGE_OP_HPD)
drm_bridge_hpd_disable(lt->hdmi_port);

drm_connector_unregister(&lt->connector);
drm_connector_cleanup(&lt->connector);
}
drm_connector_unregister(&lt->connector);
drm_connector_cleanup(&lt->connector);
}

static enum drm_connector_status
Expand Down Expand Up @@ -750,7 +745,6 @@ static void lt8912_remove(struct i2c_client *client)
{
struct lt8912 *lt = i2c_get_clientdata(client);

lt8912_bridge_detach(&lt->bridge);
drm_bridge_remove(&lt->bridge);
lt8912_free_i2c(lt);
lt8912_put_dt(lt);
Expand Down

0 comments on commit 941882a

Please sign in to comment.