Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/msm/dsi: simplify connector creation
Instead of having two functions, msm_dsi_manager_bridge_init()
and msm_dsi_manager_ext_bridge_init(), merge them into
msm_dsi_manager_connector_init(), moving drm_bridge_attach() to be
called from the bridge's attach callback (as most other bridges do).
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/582212/
Link: https://lore.kernel.org/r/20240309-fd-dsi-cleanup-bridges-v1-3-962ebdba82ed@linaro.org
+21
-35
+1
-9
drivers/gpu/drm/msm/dsi/dsi.c
+1
-9
drivers/gpu/drm/msm/dsi/dsi.c
···
232
232
int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
233
233
struct drm_encoder *encoder)
234
234
{
235
-
struct drm_bridge *bridge;
236
235
int ret;
237
236
238
237
msm_dsi->dev = dev;
···
251
252
return 0;
252
253
}
253
254
254
-
bridge = msm_dsi_manager_bridge_init(msm_dsi, encoder);
255
-
if (IS_ERR(bridge)) {
256
-
ret = PTR_ERR(bridge);
257
-
DRM_DEV_ERROR(dev->dev, "failed to create dsi bridge: %d\n", ret);
258
-
return ret;
259
-
}
260
-
261
-
ret = msm_dsi_manager_ext_bridge_init(msm_dsi->id, bridge);
255
+
ret = msm_dsi_manager_connector_init(msm_dsi, encoder);
262
256
if (ret) {
263
257
DRM_DEV_ERROR(dev->dev,
264
258
"failed to create dsi connector: %d\n", ret);
+2
-3
drivers/gpu/drm/msm/dsi/dsi.h
+2
-3
drivers/gpu/drm/msm/dsi/dsi.h
···
47
47
};
48
48
49
49
/* dsi manager */
50
-
struct drm_bridge *msm_dsi_manager_bridge_init(struct msm_dsi *msm_dsi,
51
-
struct drm_encoder *encoder);
52
-
int msm_dsi_manager_ext_bridge_init(u8 id, struct drm_bridge *int_bridge);
50
+
int msm_dsi_manager_connector_init(struct msm_dsi *msm_dsi,
51
+
struct drm_encoder *encoder);
53
52
int msm_dsi_manager_cmd_xfer(int id, const struct mipi_dsi_msg *msg);
54
53
bool msm_dsi_manager_cmd_xfer_trigger(int id, u32 dma_base, u32 len);
55
54
int msm_dsi_manager_register(struct msm_dsi *msm_dsi);
+18
-23
drivers/gpu/drm/msm/dsi/dsi_manager.c
+18
-23
drivers/gpu/drm/msm/dsi/dsi_manager.c
···
423
423
return msm_dsi_host_check_dsc(host, mode);
424
424
}
425
425
426
+
static int dsi_mgr_bridge_attach(struct drm_bridge *bridge,
427
+
enum drm_bridge_attach_flags flags)
428
+
{
429
+
int id = dsi_mgr_bridge_get_id(bridge);
430
+
struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);
431
+
432
+
return drm_bridge_attach(bridge->encoder, msm_dsi->next_bridge,
433
+
bridge, flags);
434
+
}
435
+
426
436
static const struct drm_bridge_funcs dsi_mgr_bridge_funcs = {
437
+
.attach = dsi_mgr_bridge_attach,
427
438
.pre_enable = dsi_mgr_bridge_pre_enable,
428
439
.post_disable = dsi_mgr_bridge_post_disable,
429
440
.mode_set = dsi_mgr_bridge_mode_set,
···
442
431
};
443
432
444
433
/* initialize bridge */
445
-
struct drm_bridge *msm_dsi_manager_bridge_init(struct msm_dsi *msm_dsi,
446
-
struct drm_encoder *encoder)
434
+
int msm_dsi_manager_connector_init(struct msm_dsi *msm_dsi,
435
+
struct drm_encoder *encoder)
447
436
{
437
+
struct drm_device *dev = msm_dsi->dev;
448
438
struct drm_bridge *bridge;
449
439
struct dsi_bridge *dsi_bridge;
440
+
struct drm_connector *connector;
450
441
int ret;
451
442
452
443
dsi_bridge = devm_kzalloc(msm_dsi->dev->dev,
453
444
sizeof(*dsi_bridge), GFP_KERNEL);
454
445
if (!dsi_bridge)
455
-
return ERR_PTR(-ENOMEM);
446
+
return -ENOMEM;
456
447
457
448
dsi_bridge->id = msm_dsi->id;
458
449
···
463
450
464
451
ret = devm_drm_bridge_add(msm_dsi->dev->dev, bridge);
465
452
if (ret)
466
-
return ERR_PTR(ret);
453
+
return ret;
467
454
468
-
ret = drm_bridge_attach(encoder, bridge, NULL, 0);
469
-
if (ret)
470
-
return ERR_PTR(ret);
471
-
472
-
return bridge;
473
-
}
474
-
475
-
int msm_dsi_manager_ext_bridge_init(u8 id, struct drm_bridge *int_bridge)
476
-
{
477
-
struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);
478
-
struct drm_device *dev = msm_dsi->dev;
479
-
struct drm_encoder *encoder;
480
-
struct drm_connector *connector;
481
-
int ret;
482
-
483
-
encoder = int_bridge->encoder;
484
-
485
-
ret = drm_bridge_attach(encoder, msm_dsi->next_bridge, int_bridge,
486
-
DRM_BRIDGE_ATTACH_NO_CONNECTOR);
455
+
ret = drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
487
456
if (ret)
488
457
return ret;
489
458