Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 191be00

Browse files
Xin-ANXrobertfoss
authored andcommitted
drm/bridge: anx7625: Add bridge helper atomic conversion
Add bridge helper atomic conversion. Reviewed-by: Robert Foss <[email protected]> Signed-off-by: Xin Ji <[email protected]> Signed-off-by: Robert Foss <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 0f29947 commit 191be00

File tree

2 files changed

+40
-7
lines changed

2 files changed

+40
-7
lines changed

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

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,25 +1911,54 @@ static bool anx7625_bridge_mode_fixup(struct drm_bridge *bridge,
19111911
return true;
19121912
}
19131913

1914-
static void anx7625_bridge_enable(struct drm_bridge *bridge)
1914+
static int anx7625_bridge_atomic_check(struct drm_bridge *bridge,
1915+
struct drm_bridge_state *bridge_state,
1916+
struct drm_crtc_state *crtc_state,
1917+
struct drm_connector_state *conn_state)
19151918
{
19161919
struct anx7625_data *ctx = bridge_to_anx7625(bridge);
19171920
struct device *dev = &ctx->client->dev;
19181921

1919-
DRM_DEV_DEBUG_DRIVER(dev, "drm enable\n");
1922+
dev_dbg(dev, "drm bridge atomic check\n");
1923+
return anx7625_bridge_mode_fixup(bridge, &crtc_state->mode,
1924+
&crtc_state->adjusted_mode);
1925+
}
1926+
1927+
static void anx7625_bridge_atomic_enable(struct drm_bridge *bridge,
1928+
struct drm_bridge_state *state)
1929+
{
1930+
struct anx7625_data *ctx = bridge_to_anx7625(bridge);
1931+
struct device *dev = &ctx->client->dev;
1932+
struct drm_connector *connector;
1933+
1934+
dev_dbg(dev, "drm atomic enable\n");
1935+
1936+
if (!bridge->encoder) {
1937+
dev_err(dev, "Parent encoder object not found");
1938+
return;
1939+
}
1940+
1941+
connector = drm_atomic_get_new_connector_for_encoder(state->base.state,
1942+
bridge->encoder);
1943+
if (!connector)
1944+
return;
1945+
1946+
ctx->connector = connector;
19201947

19211948
pm_runtime_get_sync(dev);
19221949

19231950
anx7625_dp_start(ctx);
19241951
}
19251952

1926-
static void anx7625_bridge_disable(struct drm_bridge *bridge)
1953+
static void anx7625_bridge_atomic_disable(struct drm_bridge *bridge,
1954+
struct drm_bridge_state *old)
19271955
{
19281956
struct anx7625_data *ctx = bridge_to_anx7625(bridge);
19291957
struct device *dev = &ctx->client->dev;
19301958

1931-
DRM_DEV_DEBUG_DRIVER(dev, "drm disable\n");
1959+
dev_dbg(dev, "drm atomic disable\n");
19321960

1961+
ctx->connector = NULL;
19331962
anx7625_dp_stop(ctx);
19341963

19351964
pm_runtime_put_sync(dev);
@@ -1959,11 +1988,14 @@ static struct edid *anx7625_bridge_get_edid(struct drm_bridge *bridge,
19591988

19601989
static const struct drm_bridge_funcs anx7625_bridge_funcs = {
19611990
.attach = anx7625_bridge_attach,
1962-
.disable = anx7625_bridge_disable,
19631991
.mode_valid = anx7625_bridge_mode_valid,
19641992
.mode_set = anx7625_bridge_mode_set,
1965-
.mode_fixup = anx7625_bridge_mode_fixup,
1966-
.enable = anx7625_bridge_enable,
1993+
.atomic_check = anx7625_bridge_atomic_check,
1994+
.atomic_enable = anx7625_bridge_atomic_enable,
1995+
.atomic_disable = anx7625_bridge_atomic_disable,
1996+
.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
1997+
.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
1998+
.atomic_reset = drm_atomic_helper_bridge_reset,
19671999
.detect = anx7625_bridge_detect,
19682000
.get_edid = anx7625_bridge_get_edid,
19692001
};

drivers/gpu/drm/bridge/analogix/anx7625.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ struct anx7625_data {
407407
u8 display_timing_valid;
408408
struct drm_bridge bridge;
409409
u8 bridge_attached;
410+
struct drm_connector *connector;
410411
struct mipi_dsi_device *dsi;
411412
};
412413

0 commit comments

Comments
 (0)