Skip to content

Commit f82fe0d

Browse files
committed
drm/bridge: Pass full state to atomic_post_disable
It's pretty inconvenient to access the full atomic state from drm_bridges, so let's change the atomic_post_disable hook prototype to pass it directly. Reviewed-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Douglas Anderson <[email protected]> Tested-by: Douglas Anderson <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Maxime Ripard <[email protected]>
1 parent f5f6a5b commit f82fe0d

20 files changed

+32
-46
lines changed

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,11 +1361,9 @@ static void analogix_dp_bridge_atomic_disable(struct drm_bridge *bridge,
13611361
analogix_dp_bridge_disable(bridge);
13621362
}
13631363

1364-
static void
1365-
analogix_dp_bridge_atomic_post_disable(struct drm_bridge *bridge,
1366-
struct drm_bridge_state *old_bridge_state)
1364+
static void analogix_dp_bridge_atomic_post_disable(struct drm_bridge *bridge,
1365+
struct drm_atomic_state *old_state)
13671366
{
1368-
struct drm_atomic_state *old_state = old_bridge_state->base.state;
13691367
struct analogix_dp_device *dp = bridge->driver_private;
13701368
struct drm_crtc *crtc;
13711369
struct drm_crtc_state *new_crtc_state;

drivers/gpu/drm/bridge/chipone-icn6211.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ static void chipone_atomic_pre_enable(struct drm_bridge *bridge,
481481
}
482482

483483
static void chipone_atomic_post_disable(struct drm_bridge *bridge,
484-
struct drm_bridge_state *old_bridge_state)
484+
struct drm_atomic_state *state)
485485
{
486486
struct chipone *icn = bridge_to_chipone(bridge);
487487

drivers/gpu/drm/bridge/ite-it6505.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3264,7 +3264,7 @@ static void it6505_bridge_atomic_pre_enable(struct drm_bridge *bridge,
32643264
}
32653265

32663266
static void it6505_bridge_atomic_post_disable(struct drm_bridge *bridge,
3267-
struct drm_bridge_state *old_state)
3267+
struct drm_atomic_state *state)
32683268
{
32693269
struct it6505 *it6505 = bridge_to_it6505(bridge);
32703270
struct device *dev = it6505->dev;

drivers/gpu/drm/bridge/lontium-lt9611.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -783,9 +783,8 @@ static void lt9611_bridge_atomic_pre_enable(struct drm_bridge *bridge,
783783
lt9611->sleep = false;
784784
}
785785

786-
static void
787-
lt9611_bridge_atomic_post_disable(struct drm_bridge *bridge,
788-
struct drm_bridge_state *old_bridge_state)
786+
static void lt9611_bridge_atomic_post_disable(struct drm_bridge *bridge,
787+
struct drm_atomic_state *state)
789788
{
790789
struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
791790

drivers/gpu/drm/bridge/panel.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,9 @@ static void panel_bridge_atomic_disable(struct drm_bridge *bridge,
166166
}
167167

168168
static void panel_bridge_atomic_post_disable(struct drm_bridge *bridge,
169-
struct drm_bridge_state *old_bridge_state)
169+
struct drm_atomic_state *atomic_state)
170170
{
171171
struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge);
172-
struct drm_atomic_state *atomic_state = old_bridge_state->base.state;
173172
struct drm_encoder *encoder = bridge->encoder;
174173
struct drm_crtc *crtc;
175174
struct drm_crtc_state *new_crtc_state;

drivers/gpu/drm/bridge/parade-ps8640.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ static void ps8640_atomic_pre_enable(struct drm_bridge *bridge,
472472
}
473473

474474
static void ps8640_atomic_post_disable(struct drm_bridge *bridge,
475-
struct drm_bridge_state *old_bridge_state)
475+
struct drm_atomic_state *state)
476476
{
477477
struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
478478

drivers/gpu/drm/bridge/samsung-dsim.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1508,7 +1508,7 @@ static void samsung_dsim_atomic_disable(struct drm_bridge *bridge,
15081508
}
15091509

15101510
static void samsung_dsim_atomic_post_disable(struct drm_bridge *bridge,
1511-
struct drm_bridge_state *old_bridge_state)
1511+
struct drm_atomic_state *state)
15121512
{
15131513
struct samsung_dsim *dsi = bridge_to_dsi(bridge);
15141514

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ static void dw_mipi_dsi_clear_err(struct dw_mipi_dsi *dsi)
934934
}
935935

936936
static void dw_mipi_dsi_bridge_post_atomic_disable(struct drm_bridge *bridge,
937-
struct drm_bridge_state *old_bridge_state)
937+
struct drm_atomic_state *state)
938938
{
939939
struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge);
940940
const struct dw_mipi_dsi_phy_ops *phy_ops = dsi->plat_data->phy_ops;

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ static int dw_mipi_dsi2_bridge_atomic_check(struct drm_bridge *bridge,
745745
}
746746

747747
static void dw_mipi_dsi2_bridge_post_atomic_disable(struct drm_bridge *bridge,
748-
struct drm_bridge_state *old_bridge_state)
748+
struct drm_atomic_state *state)
749749
{
750750
struct dw_mipi_dsi2 *dsi2 = bridge_to_dsi2(bridge);
751751
const struct dw_mipi_dsi2_phy_ops *phy_ops = dsi2->plat_data->phy_ops;

drivers/gpu/drm/bridge/tc358762.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ static int tc358762_init(struct tc358762 *ctx)
149149
return tc358762_clear_error(ctx);
150150
}
151151

152-
static void tc358762_post_disable(struct drm_bridge *bridge, struct drm_bridge_state *state)
152+
static void tc358762_post_disable(struct drm_bridge *bridge,
153+
struct drm_atomic_state *state)
153154
{
154155
struct tc358762 *ctx = bridge_to_tc358762(bridge);
155156
int ret;

0 commit comments

Comments
 (0)