Am Freitag, dem 18.02.2022 um 02:00 +0100 schrieb Marek Vasut: > Use the atomic version of the enable/disable operations to continue the > transition to the atomic API. This will be needed to access the mode > from the atomic state. > > Signed-off-by: Marek Vasut <marex@xxxxxxx> > Cc: Jonas Karlman <jonas@xxxxxxxxx> > Cc: Laurent Pinchart <Laurent.pinchart@xxxxxxxxxxxxxxxx> > Cc: Maxime Ripard <maxime@xxxxxxxxxx> > Cc: Neil Armstrong <narmstrong@xxxxxxxxxxxx> > Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Reviewed-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx> > --- > V2: - New patch > --- > drivers/gpu/drm/bridge/tc358767.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c > index 4b8ea0db2a5e8..522c2c4d8514f 100644 > --- a/drivers/gpu/drm/bridge/tc358767.c > +++ b/drivers/gpu/drm/bridge/tc358767.c > @@ -1234,7 +1234,9 @@ static int tc_edp_stream_disable(struct tc_data *tc) > return 0; > } > > -static void tc_edp_bridge_enable(struct drm_bridge *bridge) > +static void > +tc_edp_bridge_atomic_enable(struct drm_bridge *bridge, > + struct drm_bridge_state *old_bridge_state) > { > struct tc_data *tc = bridge_to_tc(bridge); > int ret; > @@ -1259,7 +1261,9 @@ static void tc_edp_bridge_enable(struct drm_bridge *bridge) > } > } > > -static void tc_edp_bridge_disable(struct drm_bridge *bridge) > +static void > +tc_edp_bridge_atomic_disable(struct drm_bridge *bridge, > + struct drm_bridge_state *old_bridge_state) > { > struct tc_data *tc = bridge_to_tc(bridge); > int ret; > @@ -1459,11 +1463,14 @@ static const struct drm_bridge_funcs tc_bridge_funcs = { > .detach = tc_edp_bridge_detach, > .mode_valid = tc_edp_mode_valid, > .mode_set = tc_bridge_mode_set, > - .enable = tc_edp_bridge_enable, > - .disable = tc_edp_bridge_disable, > + .atomic_enable = tc_edp_bridge_atomic_enable, > + .atomic_disable = tc_edp_bridge_atomic_disable, > .mode_fixup = tc_bridge_mode_fixup, > .detect = tc_bridge_detect, > .get_edid = tc_get_edid, > + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, > + .atomic_reset = drm_atomic_helper_bridge_reset, > }; > > static bool tc_readable_reg(struct device *dev, unsigned int reg)