diff options
| author | Robert Chiras <robert.chiras@nxp.com> | 2020-05-11 10:48:42 +0300 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2021-11-02 16:38:45 +0800 |
| commit | 8274b76ab2c84d72c0aecbe2679285efe66ab732 (patch) | |
| tree | e845010e76ea25fead936a8c4ec71ede9549fb81 /drivers/gpu/drm/bridge/adv7511 | |
| parent | 823e628e0cc2dab60d118504e54664788e09f4eb (diff) | |
LF-1411-2 drm/bridge: adv7511: implement drm_bridge detach
The detach callback was not implemented in adv7511 driver, so implement
it now, in order to have a correct cleanup mechanism. Also, move the
dsi detach into drm_bridge detach, so the operations are done in the
correct reverse order.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Diffstat (limited to 'drivers/gpu/drm/bridge/adv7511')
| -rw-r--r-- | drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 3f3a91346d93..e60d8f755141 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -990,6 +990,19 @@ static void adv7511_bridge_hpd_notify(struct drm_bridge *bridge, cec_phys_addr_invalidate(adv->cec_adap); } +static void adv7511_bridge_detach(struct drm_bridge *bridge) +{ + struct adv7511 *adv = bridge_to_adv7511(bridge); + + if (adv->i2c_main->irq) + regmap_write(adv->regmap, ADV7511_REG_INT_ENABLE(0), 0); + + if (adv->type == ADV7533 || adv->type == ADV7535) + adv7533_detach_dsi(adv); + + drm_connector_cleanup(&adv->connector); +} + static const struct drm_bridge_funcs adv7511_bridge_funcs = { .enable = adv7511_bridge_enable, .disable = adv7511_bridge_disable, @@ -998,6 +1011,7 @@ static const struct drm_bridge_funcs adv7511_bridge_funcs = { .detect = adv7511_bridge_detect, .get_edid = adv7511_bridge_get_edid, .hpd_notify = adv7511_bridge_hpd_notify, + .detach = adv7511_bridge_detach, }; /* ----------------------------------------------------------------------------- @@ -1407,8 +1421,6 @@ static int adv7511_remove(struct i2c_client *i2c) { struct adv7511 *adv7511 = i2c_get_clientdata(i2c); - if (adv7511->type == ADV7533 || adv7511->type == ADV7535) - adv7533_detach_dsi(adv7511); i2c_unregister_device(adv7511->i2c_cec); clk_disable_unprepare(adv7511->cec_clk); |