Replace legacy .enable and .disable callbacks with their atomic counterparts .atomic_enable and .atomic_disable.
Also, add turn off the serialiser inside atomic_disable(). Signed-off-by: Dharma Balasubiramani <[email protected]> --- drivers/gpu/drm/bridge/microchip-lvds.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/bridge/microchip-lvds.c b/drivers/gpu/drm/bridge/microchip-lvds.c index 06d4169a2d8f..c40c8717f026 100644 --- a/drivers/gpu/drm/bridge/microchip-lvds.c +++ b/drivers/gpu/drm/bridge/microchip-lvds.c @@ -111,7 +111,8 @@ static int mchp_lvds_attach(struct drm_bridge *bridge, bridge, flags); } -static void mchp_lvds_enable(struct drm_bridge *bridge) +static void mchp_lvds_atomic_enable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct mchp_lvds *lvds = bridge_to_lvds(bridge); int ret; @@ -131,18 +132,22 @@ static void mchp_lvds_enable(struct drm_bridge *bridge) lvds_serialiser_on(lvds); } -static void mchp_lvds_disable(struct drm_bridge *bridge) +static void mchp_lvds_atomic_disable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct mchp_lvds *lvds = bridge_to_lvds(bridge); + /* Turn off the serialiser */ + lvds_writel(lvds, LVDSC_CR, 0); + pm_runtime_put(lvds->dev); clk_disable_unprepare(lvds->pclk); } static const struct drm_bridge_funcs mchp_lvds_bridge_funcs = { .attach = mchp_lvds_attach, - .enable = mchp_lvds_enable, - .disable = mchp_lvds_disable, + .atomic_enable = mchp_lvds_atomic_enable, + .atomic_disable = mchp_lvds_atomic_disable, }; static int mchp_lvds_probe(struct platform_device *pdev) -- 2.43.0
