system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-17 08:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/mediatek: mtk_dsi: Convert to bridge driver

Browse source 
Convert mtk_dsi to a bridge driver with built-in encoder support for
compatibility with existing component drivers.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
This commit is contained in:
Enric Balletbo i Serra 2020-06-15 22:31:05 +02:00 committed by Chun-Kuang Hu
parent 68a9e11b07
commit 71e780f115
1 changed files with 79 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
drivers/gpu/drm/mediatek/mtk_dsi.c
View file

@ -181,6 +181,7 @@ struct mtk_dsi {
struct device *dev; struct device *dev;
struct mipi_dsi_host host; struct mipi_dsi_host host;
struct drm_encoder encoder; struct drm_encoder encoder;
struct drm_bridge bridge;
struct drm_connector conn; struct drm_connector conn;
struct drm_panel *panel; struct drm_panel *panel;
struct drm_bridge *next_bridge; struct drm_bridge *next_bridge;
@ -206,9 +207,9 @@ struct mtk_dsi {
const struct mtk_dsi_driver_data *driver_data; const struct mtk_dsi_driver_data *driver_data;
}; };
static inline struct mtk_dsi *encoder_to_dsi(struct drm_encoder *e) static inline struct mtk_dsi *bridge_to_dsi(struct drm_bridge *b)
{ {
return container_of(e, struct mtk_dsi, encoder); return container_of(b, struct mtk_dsi, bridge);
} }
static inline struct mtk_dsi *connector_to_dsi(struct drm_connector *c) static inline struct mtk_dsi *connector_to_dsi(struct drm_connector *c)
@ -785,32 +786,52 @@ static void mtk_output_dsi_disable(struct mtk_dsi *dsi)
dsi->enabled = false; dsi->enabled = false;
} }
static bool mtk_dsi_encoder_mode_fixup(struct drm_encoder *encoder, static void mtk_dsi_encoder_destroy(struct drm_encoder *encoder)
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{ {
return true; drm_encoder_cleanup(encoder);
} }
static void mtk_dsi_encoder_mode_set(struct drm_encoder *encoder, static const struct drm_encoder_funcs mtk_dsi_encoder_funcs = {
struct drm_display_mode *mode, .destroy = mtk_dsi_encoder_destroy,
struct drm_display_mode *adjusted) };
static int mtk_dsi_create_conn_enc(struct drm_device *drm, struct mtk_dsi *dsi);
static void mtk_dsi_destroy_conn_enc(struct mtk_dsi *dsi);
static int mtk_dsi_bridge_attach(struct drm_bridge *bridge,
enum drm_bridge_attach_flags flags)
{ {
struct mtk_dsi *dsi = encoder_to_dsi(encoder); struct mtk_dsi *dsi = bridge_to_dsi(bridge);
return mtk_dsi_create_conn_enc(bridge->dev, dsi);
}
static void mtk_dsi_bridge_detach(struct drm_bridge *bridge)
{
struct mtk_dsi *dsi = bridge_to_dsi(bridge);
mtk_dsi_destroy_conn_enc(dsi);
}
static void mtk_dsi_bridge_mode_set(struct drm_bridge *bridge,
const struct drm_display_mode *mode,
const struct drm_display_mode *adjusted)
{
struct mtk_dsi *dsi = bridge_to_dsi(bridge);
drm_display_mode_to_videomode(adjusted, &dsi->vm); drm_display_mode_to_videomode(adjusted, &dsi->vm);
} }
static void mtk_dsi_encoder_disable(struct drm_encoder *encoder) static void mtk_dsi_bridge_disable(struct drm_bridge *bridge)
{ {
struct mtk_dsi *dsi = encoder_to_dsi(encoder); struct mtk_dsi *dsi = bridge_to_dsi(bridge);
mtk_output_dsi_disable(dsi); mtk_output_dsi_disable(dsi);
} }
static void mtk_dsi_encoder_enable(struct drm_encoder *encoder) static void mtk_dsi_bridge_enable(struct drm_bridge *bridge)
{ {
struct mtk_dsi *dsi = encoder_to_dsi(encoder); struct mtk_dsi *dsi = bridge_to_dsi(bridge);
mtk_output_dsi_enable(dsi); mtk_output_dsi_enable(dsi);
} }
@ -822,11 +843,12 @@ static int mtk_dsi_connector_get_modes(struct drm_connector *connector)
return drm_panel_get_modes(dsi->panel, connector); return drm_panel_get_modes(dsi->panel, connector);
} }
static const struct drm_encoder_helper_funcs mtk_dsi_encoder_helper_funcs = { static const struct drm_bridge_funcs mtk_dsi_bridge_funcs = {
.mode_fixup = mtk_dsi_encoder_mode_fixup, .attach = mtk_dsi_bridge_attach,
.mode_set = mtk_dsi_encoder_mode_set, .detach = mtk_dsi_bridge_detach,
.disable = mtk_dsi_encoder_disable, .disable = mtk_dsi_bridge_disable,
.enable = mtk_dsi_encoder_enable, .enable = mtk_dsi_bridge_enable,
.mode_set = mtk_dsi_bridge_mode_set,
}; };
static const struct drm_connector_funcs mtk_dsi_connector_funcs = { static const struct drm_connector_funcs mtk_dsi_connector_funcs = {
@ -877,20 +899,6 @@ static int mtk_dsi_create_conn_enc(struct drm_device *drm, struct mtk_dsi *dsi)
{ {
int ret; int ret;
ret = drm_simple_encoder_init(drm, &dsi->encoder,
DRM_MODE_ENCODER_DSI);
if (ret) {
DRM_ERROR("Failed to encoder init to drm\n");
return ret;
}
drm_encoder_helper_add(&dsi->encoder, &mtk_dsi_encoder_helper_funcs);
/*
* Currently display data paths are statically assigned to a crtc each.
* crtc 0 is OVL0 -> COLOR0 -> AAL -> OD -> RDMA0 -> UFOE -> DSI0
*/
dsi->encoder.possible_crtcs = 1;
/* If there's a next bridge, attach to it and let it create the connector */ /* If there's a next bridge, attach to it and let it create the connector */
if (dsi->next_bridge) { if (dsi->next_bridge) {
ret = drm_bridge_attach(&dsi->encoder, dsi->next_bridge, NULL, ret = drm_bridge_attach(&dsi->encoder, dsi->next_bridge, NULL,
@ -1112,6 +1120,34 @@ static const struct mipi_dsi_host_ops mtk_dsi_ops = {
.transfer = mtk_dsi_host_transfer, .transfer = mtk_dsi_host_transfer,
}; };
static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi)
{
int ret;
ret = drm_encoder_init(drm, &dsi->encoder, &mtk_dsi_encoder_funcs,
DRM_MODE_ENCODER_DSI, NULL);
if (ret) {
DRM_ERROR("Failed to encoder init to drm\n");
return ret;
}
/*
* Currently display data paths are statically assigned to a crtc each.
* crtc 0 is OVL0 -> COLOR0 -> AAL -> OD -> RDMA0 -> UFOE -> DSI0
*/
dsi->encoder.possible_crtcs = 1;
ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0);
if (ret)
goto err_cleanup_encoder;
return 0;
err_cleanup_encoder:
drm_encoder_cleanup(&dsi->encoder);
return ret;
}
static int mtk_dsi_bind(struct device *dev, struct device *master, void *data) static int mtk_dsi_bind(struct device *dev, struct device *master, void *data)
{ {
int ret; int ret;
@ -1125,11 +1161,9 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data)
return ret; return ret;
} }
ret = mtk_dsi_create_conn_enc(drm, dsi); ret = mtk_dsi_encoder_init(drm, dsi);
if (ret) { if (ret)
DRM_ERROR("Encoder create failed with %d\n", ret);
goto err_unregister; goto err_unregister;
}
return 0; return 0;
@ -1144,7 +1178,7 @@ static void mtk_dsi_unbind(struct device *dev, struct device *master,
struct drm_device *drm = data; struct drm_device *drm = data;
struct mtk_dsi *dsi = dev_get_drvdata(dev); struct mtk_dsi *dsi = dev_get_drvdata(dev);
mtk_dsi_destroy_conn_enc(dsi); drm_encoder_cleanup(&dsi->encoder);
mtk_ddp_comp_unregister(drm, &dsi->ddp_comp); mtk_ddp_comp_unregister(drm, &dsi->ddp_comp);
} }
@ -1254,6 +1288,12 @@ static int mtk_dsi_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, dsi); platform_set_drvdata(pdev, dsi);
dsi->bridge.funcs = &mtk_dsi_bridge_funcs;
dsi->bridge.of_node = dev->of_node;
dsi->bridge.type = DRM_MODE_CONNECTOR_DSI;
drm_bridge_add(&dsi->bridge);
ret = component_add(&pdev->dev, &mtk_dsi_component_ops); ret = component_add(&pdev->dev, &mtk_dsi_component_ops);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to add component: %d\n", ret); dev_err(&pdev->dev, "failed to add component: %d\n", ret);
@ -1272,6 +1312,7 @@ static int mtk_dsi_remove(struct platform_device *pdev)
struct mtk_dsi *dsi = platform_get_drvdata(pdev); struct mtk_dsi *dsi = platform_get_drvdata(pdev);
mtk_output_dsi_disable(dsi); mtk_output_dsi_disable(dsi);
drm_bridge_remove(&dsi->bridge);
component_del(&pdev->dev, &mtk_dsi_component_ops); component_del(&pdev->dev, &mtk_dsi_component_ops);
mipi_dsi_host_unregister(&dsi->host); mipi_dsi_host_unregister(&dsi->host);