Skip to content

Commit e74b84c

Browse files
lucaceresoliFomys
lucaceresoli
authored and
Fomys
committed
drm/bridge: imx8*-ldb: convert to devm_drm_bridge_alloc() API
This is the new API for allocating DRM bridges. These two drivers are tangled together by the ldb_add_bridge_helper(), so they are converted at once. They also have a similar design, each embedding an array of channels in their main struct, and each channel embeds a drm_bridge. This prevents dynamic, refcount-based deallocation of the bridges. To make the new, dynamic bridge allocation possible: * change the array of channels into an array of channel pointers * allocate each channel using devm_drm_bridge_alloc() * adapt ldb_add_bridge_helper() to not set the funcs pointer (now done by devm_drm_bridge_alloc()) * adapt the code wherever using the channels Signed-off-by: Luca Ceresoli <[email protected]> Acked-by: Liu Ying <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/20250424-drm-bridge-convert-to-alloc-api-v2-31-8f91a404d86b@bootlin.com Signed-off-by: Louis Chauvet <[email protected]>
1 parent 9545c91 commit e74b84c

File tree

4 files changed

+36
-23
lines changed

4 files changed

+36
-23
lines changed

‎drivers/gpu/drm/bridge/imx/imx-ldb-helper.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,7 @@ int ldb_find_next_bridge_helper(struct ldb *ldb)
190190
}
191191
EXPORT_SYMBOL_GPL(ldb_find_next_bridge_helper);
192192

193-
void ldb_add_bridge_helper(struct ldb *ldb,
194-
const struct drm_bridge_funcs *bridge_funcs)
193+
void ldb_add_bridge_helper(struct ldb *ldb)
195194
{
196195
struct ldb_channel *ldb_ch;
197196
int i;
@@ -203,7 +202,6 @@ void ldb_add_bridge_helper(struct ldb *ldb,
203202
continue;
204203

205204
ldb_ch->bridge.driver_private = ldb_ch;
206-
ldb_ch->bridge.funcs = bridge_funcs;
207205
ldb_ch->bridge.of_node = ldb_ch->np;
208206

209207
drm_bridge_add(&ldb_ch->bridge);

‎drivers/gpu/drm/bridge/imx/imx-ldb-helper.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ int ldb_init_helper(struct ldb *ldb);
8888

8989
int ldb_find_next_bridge_helper(struct ldb *ldb);
9090

91-
void ldb_add_bridge_helper(struct ldb *ldb,
92-
const struct drm_bridge_funcs *bridge_funcs);
91+
void ldb_add_bridge_helper(struct ldb *ldb);
9392

9493
void ldb_remove_bridge_helper(struct ldb *ldb);
9594

‎drivers/gpu/drm/bridge/imx/imx8qm-ldb.c‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ struct imx8qm_ldb_channel {
4747
struct imx8qm_ldb {
4848
struct ldb base;
4949
struct device *dev;
50-
struct imx8qm_ldb_channel channel[MAX_LDB_CHAN_NUM];
50+
struct imx8qm_ldb_channel *channel[MAX_LDB_CHAN_NUM];
5151
struct clk *clk_pixel;
5252
struct clk *clk_bypass;
5353
int active_chno;
@@ -107,7 +107,7 @@ static int imx8qm_ldb_bridge_atomic_check(struct drm_bridge *bridge,
107107

108108
if (is_split) {
109109
imx8qm_ldb_ch =
110-
&imx8qm_ldb->channel[imx8qm_ldb->active_chno ^ 1];
110+
imx8qm_ldb->channel[imx8qm_ldb->active_chno ^ 1];
111111
imx8qm_ldb_set_phy_cfg(imx8qm_ldb, di_clk, is_split, true,
112112
phy_cfg);
113113
ret = phy_validate(imx8qm_ldb_ch->phy, PHY_MODE_LVDS, 0, &opts);
@@ -158,7 +158,7 @@ imx8qm_ldb_bridge_mode_set(struct drm_bridge *bridge,
158158

159159
if (is_split) {
160160
imx8qm_ldb_ch =
161-
&imx8qm_ldb->channel[imx8qm_ldb->active_chno ^ 1];
161+
imx8qm_ldb->channel[imx8qm_ldb->active_chno ^ 1];
162162
imx8qm_ldb_set_phy_cfg(imx8qm_ldb, di_clk, is_split, true,
163163
phy_cfg);
164164
ret = phy_configure(imx8qm_ldb_ch->phy, &opts);
@@ -226,13 +226,13 @@ static void imx8qm_ldb_bridge_atomic_enable(struct drm_bridge *bridge,
226226
}
227227

228228
if (is_split) {
229-
ret = phy_power_on(imx8qm_ldb->channel[0].phy);
229+
ret = phy_power_on(imx8qm_ldb->channel[0]->phy);
230230
if (ret)
231231
DRM_DEV_ERROR(dev,
232232
"failed to power on channel0 PHY: %d\n",
233233
ret);
234234

235-
ret = phy_power_on(imx8qm_ldb->channel[1].phy);
235+
ret = phy_power_on(imx8qm_ldb->channel[1]->phy);
236236
if (ret)
237237
DRM_DEV_ERROR(dev,
238238
"failed to power on channel1 PHY: %d\n",
@@ -261,12 +261,12 @@ static void imx8qm_ldb_bridge_atomic_disable(struct drm_bridge *bridge,
261261
ldb_bridge_disable_helper(bridge);
262262

263263
if (is_split) {
264-
ret = phy_power_off(imx8qm_ldb->channel[0].phy);
264+
ret = phy_power_off(imx8qm_ldb->channel[0]->phy);
265265
if (ret)
266266
DRM_DEV_ERROR(dev,
267267
"failed to power off channel0 PHY: %d\n",
268268
ret);
269-
ret = phy_power_off(imx8qm_ldb->channel[1].phy);
269+
ret = phy_power_off(imx8qm_ldb->channel[1]->phy);
270270
if (ret)
271271
DRM_DEV_ERROR(dev,
272272
"failed to power off channel1 PHY: %d\n",
@@ -412,7 +412,7 @@ static int imx8qm_ldb_get_phy(struct imx8qm_ldb *imx8qm_ldb)
412412
int i, ret;
413413

414414
for (i = 0; i < MAX_LDB_CHAN_NUM; i++) {
415-
imx8qm_ldb_ch = &imx8qm_ldb->channel[i];
415+
imx8qm_ldb_ch = imx8qm_ldb->channel[i];
416416
ldb_ch = &imx8qm_ldb_ch->base;
417417

418418
if (!ldb_ch->is_available)
@@ -448,6 +448,14 @@ static int imx8qm_ldb_probe(struct platform_device *pdev)
448448
if (!imx8qm_ldb)
449449
return -ENOMEM;
450450

451+
for (i = 0; i < MAX_LDB_CHAN_NUM; i++) {
452+
imx8qm_ldb->channel[i] =
453+
devm_drm_bridge_alloc(dev, struct imx8qm_ldb_channel, base.bridge,
454+
&imx8qm_ldb_bridge_funcs);
455+
if (IS_ERR(imx8qm_ldb->channel[i]))
456+
return PTR_ERR(imx8qm_ldb->channel[i]);
457+
}
458+
451459
imx8qm_ldb->clk_pixel = devm_clk_get(dev, "pixel");
452460
if (IS_ERR(imx8qm_ldb->clk_pixel)) {
453461
ret = PTR_ERR(imx8qm_ldb->clk_pixel);
@@ -473,7 +481,7 @@ static int imx8qm_ldb_probe(struct platform_device *pdev)
473481
ldb->ctrl_reg = 0xe0;
474482

475483
for (i = 0; i < MAX_LDB_CHAN_NUM; i++)
476-
ldb->channel[i] = &imx8qm_ldb->channel[i].base;
484+
ldb->channel[i] = &imx8qm_ldb->channel[i]->base;
477485

478486
ret = ldb_init_helper(ldb);
479487
if (ret)
@@ -499,12 +507,12 @@ static int imx8qm_ldb_probe(struct platform_device *pdev)
499507
}
500508

501509
imx8qm_ldb->active_chno = 0;
502-
imx8qm_ldb_ch = &imx8qm_ldb->channel[0];
510+
imx8qm_ldb_ch = imx8qm_ldb->channel[0];
503511
ldb_ch = &imx8qm_ldb_ch->base;
504512
ldb_ch->link_type = pixel_order;
505513
} else {
506514
for (i = 0; i < MAX_LDB_CHAN_NUM; i++) {
507-
imx8qm_ldb_ch = &imx8qm_ldb->channel[i];
515+
imx8qm_ldb_ch = imx8qm_ldb->channel[i];
508516
ldb_ch = &imx8qm_ldb_ch->base;
509517

510518
if (ldb_ch->is_available) {
@@ -525,7 +533,7 @@ static int imx8qm_ldb_probe(struct platform_device *pdev)
525533
platform_set_drvdata(pdev, imx8qm_ldb);
526534
pm_runtime_enable(dev);
527535

528-
ldb_add_bridge_helper(ldb, &imx8qm_ldb_bridge_funcs);
536+
ldb_add_bridge_helper(ldb);
529537

530538
return ret;
531539
}

‎drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ struct imx8qxp_ldb_channel {
4444
struct imx8qxp_ldb {
4545
struct ldb base;
4646
struct device *dev;
47-
struct imx8qxp_ldb_channel channel[MAX_LDB_CHAN_NUM];
47+
struct imx8qxp_ldb_channel *channel[MAX_LDB_CHAN_NUM];
4848
struct clk *clk_pixel;
4949
struct clk *clk_bypass;
5050
struct drm_bridge *companion;
@@ -410,7 +410,7 @@ static const struct drm_bridge_funcs imx8qxp_ldb_bridge_funcs = {
410410
static int imx8qxp_ldb_set_di_id(struct imx8qxp_ldb *imx8qxp_ldb)
411411
{
412412
struct imx8qxp_ldb_channel *imx8qxp_ldb_ch =
413-
&imx8qxp_ldb->channel[imx8qxp_ldb->active_chno];
413+
imx8qxp_ldb->channel[imx8qxp_ldb->active_chno];
414414
struct ldb_channel *ldb_ch = &imx8qxp_ldb_ch->base;
415415
struct device_node *ep, *remote;
416416
struct device *dev = imx8qxp_ldb->dev;
@@ -456,7 +456,7 @@ imx8qxp_ldb_check_chno_and_dual_link(struct ldb_channel *ldb_ch, int link)
456456
static int imx8qxp_ldb_parse_dt_companion(struct imx8qxp_ldb *imx8qxp_ldb)
457457
{
458458
struct imx8qxp_ldb_channel *imx8qxp_ldb_ch =
459-
&imx8qxp_ldb->channel[imx8qxp_ldb->active_chno];
459+
imx8qxp_ldb->channel[imx8qxp_ldb->active_chno];
460460
struct ldb_channel *ldb_ch = &imx8qxp_ldb_ch->base;
461461
struct ldb_channel *companion_ldb_ch;
462462
struct device_node *companion;
@@ -586,6 +586,14 @@ static int imx8qxp_ldb_probe(struct platform_device *pdev)
586586
if (!imx8qxp_ldb)
587587
return -ENOMEM;
588588

589+
for (i = 0; i < MAX_LDB_CHAN_NUM; i++) {
590+
imx8qxp_ldb->channel[i] =
591+
devm_drm_bridge_alloc(dev, struct imx8qxp_ldb_channel, base.bridge,
592+
&imx8qxp_ldb_bridge_funcs);
593+
if (IS_ERR(imx8qxp_ldb->channel[i]))
594+
return PTR_ERR(imx8qxp_ldb->channel[i]);
595+
}
596+
589597
imx8qxp_ldb->clk_pixel = devm_clk_get(dev, "pixel");
590598
if (IS_ERR(imx8qxp_ldb->clk_pixel)) {
591599
ret = PTR_ERR(imx8qxp_ldb->clk_pixel);
@@ -611,7 +619,7 @@ static int imx8qxp_ldb_probe(struct platform_device *pdev)
611619
ldb->ctrl_reg = 0xe0;
612620

613621
for (i = 0; i < MAX_LDB_CHAN_NUM; i++)
614-
ldb->channel[i] = &imx8qxp_ldb->channel[i].base;
622+
ldb->channel[i] = &imx8qxp_ldb->channel[i]->base;
615623

616624
ret = ldb_init_helper(ldb);
617625
if (ret)
@@ -627,7 +635,7 @@ static int imx8qxp_ldb_probe(struct platform_device *pdev)
627635
}
628636

629637
for (i = 0; i < MAX_LDB_CHAN_NUM; i++) {
630-
imx8qxp_ldb_ch = &imx8qxp_ldb->channel[i];
638+
imx8qxp_ldb_ch = imx8qxp_ldb->channel[i];
631639
ldb_ch = &imx8qxp_ldb_ch->base;
632640

633641
if (ldb_ch->is_available) {
@@ -660,7 +668,7 @@ static int imx8qxp_ldb_probe(struct platform_device *pdev)
660668
platform_set_drvdata(pdev, imx8qxp_ldb);
661669
pm_runtime_enable(dev);
662670

663-
ldb_add_bridge_helper(ldb, &imx8qxp_ldb_bridge_funcs);
671+
ldb_add_bridge_helper(ldb);
664672

665673
return 0;
666674
}

0 commit comments

Comments
 (0)