Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/msm/dsi: remove msm_dsi::encoder
There is no need anymore to stop the drm_encoder instance in struct
msm_dsi. Remove corresponding field.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/561697/
Link: https://lore.kernel.org/r/20231009205727.2781802-5-dmitry.baryshkov@linaro.org
+6
-12
+1
-3
drivers/gpu/drm/msm/dsi/dsi.c
+1
-3
drivers/gpu/drm/msm/dsi/dsi.c
···
236
236
return 0;
237
237
}
238
238
239
-
msm_dsi->encoder = encoder;
240
-
241
-
bridge = msm_dsi_manager_bridge_init(msm_dsi);
239
+
bridge = msm_dsi_manager_bridge_init(msm_dsi, encoder);
242
240
if (IS_ERR(bridge)) {
243
241
ret = PTR_ERR(bridge);
244
242
DRM_DEV_ERROR(dev->dev, "failed to create dsi bridge: %d\n", ret);
+2
-4
drivers/gpu/drm/msm/dsi/dsi.h
+2
-4
drivers/gpu/drm/msm/dsi/dsi.h
···
41
41
struct device *phy_dev;
42
42
bool phy_enabled;
43
43
44
-
/* the encoder we are hooked to (outside of dsi block) */
45
-
struct drm_encoder *encoder;
46
-
47
44
int id;
48
45
};
49
46
50
47
/* dsi manager */
51
-
struct drm_bridge *msm_dsi_manager_bridge_init(struct msm_dsi *msm_dsi);
48
+
struct drm_bridge *msm_dsi_manager_bridge_init(struct msm_dsi *msm_dsi,
49
+
struct drm_encoder *encoder);
52
50
int msm_dsi_manager_ext_bridge_init(u8 id, struct drm_bridge *int_bridge);
53
51
int msm_dsi_manager_cmd_xfer(int id, const struct mipi_dsi_msg *msg);
54
52
bool msm_dsi_manager_cmd_xfer_trigger(int id, u32 dma_base, u32 len);
+3
-5
drivers/gpu/drm/msm/dsi/dsi_manager.c
+3
-5
drivers/gpu/drm/msm/dsi/dsi_manager.c
···
431
431
};
432
432
433
433
/* initialize bridge */
434
-
struct drm_bridge *msm_dsi_manager_bridge_init(struct msm_dsi *msm_dsi)
434
+
struct drm_bridge *msm_dsi_manager_bridge_init(struct msm_dsi *msm_dsi,
435
+
struct drm_encoder *encoder)
435
436
{
436
437
struct drm_bridge *bridge;
437
438
struct dsi_bridge *dsi_bridge;
438
-
struct drm_encoder *encoder;
439
439
int ret;
440
440
441
441
dsi_bridge = devm_kzalloc(msm_dsi->dev->dev,
···
444
444
return ERR_PTR(-ENOMEM);
445
445
446
446
dsi_bridge->id = msm_dsi->id;
447
-
448
-
encoder = msm_dsi->encoder;
449
447
450
448
bridge = &dsi_bridge->base;
451
449
bridge->funcs = &dsi_mgr_bridge_funcs;
···
472
474
if (IS_ERR(ext_bridge))
473
475
return PTR_ERR(ext_bridge);
474
476
475
-
encoder = msm_dsi->encoder;
477
+
encoder = int_bridge->encoder;
476
478
477
479
/*
478
480
* Try first to create the bridge without it creating its own