Skip to content

L
linux
Commit 70e360f9 authored by Jagan Teki's avatar Jagan Teki Committed by Inki Dae
Browse files
Options

drm: exynos: dsi: Consolidate component and bridge 

DSI host registration, attach and detach operations are quite
different for the component and bridge-based DRM drivers.

Supporting generic bridge driver to use both component and bridge
based DRM drivers can be tricky and would require additional host
related operation hooks.

Add host operation hooks for registering and unregistering Exynos
and generic drivers, where Exynos hooks are used in existing Exynos
component based DRM drivers and generic hooks are used in i.MX8M
bridge based DRM drivers.

Add host attach and detach operation hooks for Exynos component
DRM drivers and those get invoked while DSI core host attach and
detach gets called.
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarJagan Teki <jagan@amarulasolutions.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 44d214a7
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 23 deletions
drivers/gpu/drm/exynos/exynos_drm_dsi.c
View file @ 70e360f9
......@@ -283,10 +283,10 @@ struct exynos_dsi_driver_data {
struct exynos_dsi_plat_data {
enum exynos_dsi_type hw_type;
const struct exynos_dsim_host_ops *host_ops;
};
struct exynos_dsi {
struct drm_encoder encoder;
struct mipi_dsi_host dsi_host;
struct drm_bridge bridge;
struct drm_bridge *out_bridge;
......@@ -316,6 +316,19 @@ struct exynos_dsi {
const struct exynos_dsi_driver_data *driver_data;
const struct exynos_dsi_plat_data *plat_data;
void *priv;
};
struct exynos_dsim_host_ops {
int (*register_host)(struct exynos_dsi *dsim);
void (*unregister_host)(struct exynos_dsi *dsim);
int (*attach)(struct exynos_dsi *dsim, struct mipi_dsi_device *device);
void (*detach)(struct exynos_dsi *dsim, struct mipi_dsi_device *device);
};
struct exynos_dsi_enc {
struct drm_encoder encoder;
};
#define host_to_dsi(host) container_of(host, struct exynos_dsi, dsi_host)
......@@ -1320,7 +1333,8 @@ static irqreturn_t exynos_dsi_irq(int irq, void *dev_id)
static irqreturn_t exynos_dsi_te_irq_handler(int irq, void *dev_id)
{
struct exynos_dsi *dsi = (struct exynos_dsi *)dev_id;
struct drm_encoder *encoder = &dsi->encoder;
struct exynos_dsi_enc *dsi_enc = dsi->priv;
struct drm_encoder *encoder = &dsi_enc->encoder;
if (dsi->state & DSIM_STATE_VIDOUT_AVAILABLE)
exynos_drm_crtc_te_handler(encoder->crtc);
......@@ -1589,9 +1603,8 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
struct mipi_dsi_device *device)
{
struct exynos_dsi *dsi = host_to_dsi(host);
const struct exynos_dsi_plat_data *pdata = dsi->plat_data;
struct device *dev = dsi->dev;
struct drm_encoder *encoder = &dsi->encoder;
struct drm_device *drm = encoder->dev;
struct device_node *np = dev->of_node;
struct device_node *remote;
struct drm_panel *panel;
......@@ -1648,11 +1661,6 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
drm_bridge_add(&dsi->bridge);
drm_bridge_attach(encoder, &dsi->bridge,
list_first_entry_or_null(&encoder->bridge_chain,
struct drm_bridge,
chain_node), 0);
/*
* This is a temporary solution and should be made by more generic way.
*
......@@ -1665,18 +1673,15 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
return ret;
}
mutex_lock(&drm->mode_config.mutex);
if (pdata->host_ops && pdata->host_ops->attach) {
ret = pdata->host_ops->attach(dsi, device);
if (ret)
return ret;
}
dsi->lanes = device->lanes;
dsi->format = device->format;
dsi->mode_flags = device->mode_flags;
exynos_drm_crtc_get_by_type(drm, EXYNOS_DISPLAY_TYPE_LCD)->i80_mode =
!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO);
mutex_unlock(&drm->mode_config.mutex);
if (drm->mode_config.poll_enabled)
drm_kms_helper_hotplug_event(drm);
return 0;
}
......@@ -1685,12 +1690,12 @@ static int exynos_dsi_host_detach(struct mipi_dsi_host *host,
struct mipi_dsi_device *device)
{
struct exynos_dsi *dsi = host_to_dsi(host);
struct drm_device *drm = dsi->encoder.dev;
const struct exynos_dsi_plat_data *pdata = dsi->plat_data;
dsi->out_bridge = NULL;
if (drm->mode_config.poll_enabled)
drm_kms_helper_hotplug_event(drm);
if (pdata->host_ops && pdata->host_ops->detach)
pdata->host_ops->detach(dsi, device);
exynos_dsi_unregister_te_irq(dsi);
......@@ -1766,11 +1771,50 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)
return 0;
}
static int exynos_dsim_host_attach(struct exynos_dsi *dsim,
struct mipi_dsi_device *device)
{
struct exynos_dsi_enc *dsi_enc = dsim->priv;
struct drm_encoder *encoder = &dsi_enc->encoder;
struct drm_device *drm = encoder->dev;
drm_bridge_attach(encoder, &dsim->bridge,
list_first_entry_or_null(&encoder->bridge_chain,
struct drm_bridge,
chain_node), 0);
mutex_lock(&drm->mode_config.mutex);
dsim->lanes = device->lanes;
dsim->format = device->format;
dsim->mode_flags = device->mode_flags;
exynos_drm_crtc_get_by_type(drm, EXYNOS_DISPLAY_TYPE_LCD)->i80_mode =
!(dsim->mode_flags & MIPI_DSI_MODE_VIDEO);
mutex_unlock(&drm->mode_config.mutex);
if (drm->mode_config.poll_enabled)
drm_kms_helper_hotplug_event(drm);
return 0;
}
static void exynos_dsim_host_detach(struct exynos_dsi *dsim,
struct mipi_dsi_device *device)
{
struct exynos_dsi_enc *dsi_enc = dsim->priv;
struct drm_device *drm = dsi_enc->encoder.dev;
if (drm->mode_config.poll_enabled)
drm_kms_helper_hotplug_event(drm);
}
static int exynos_dsi_bind(struct device *dev, struct device *master,
void *data)
{
struct exynos_dsi *dsi = dev_get_drvdata(dev);
struct drm_encoder *encoder = &dsi->encoder;
struct exynos_dsi_enc *dsi_enc = dsi->priv;
struct drm_encoder *encoder = &dsi_enc->encoder;
struct drm_device *drm_dev = data;
int ret;
......@@ -1788,7 +1832,7 @@ static void exynos_dsi_unbind(struct device *dev, struct device *master,
{
struct exynos_dsi *dsi = dev_get_drvdata(dev);
exynos_dsi_atomic_disable(&dsi->bridge, NULL);
dsi->bridge.funcs->atomic_disable(&dsi->bridge, NULL);
mipi_dsi_host_unregister(&dsi->dsi_host);
}
......@@ -1798,6 +1842,40 @@ static const struct component_ops exynos_dsi_component_ops = {
.unbind = exynos_dsi_unbind,
};
static int exynos_dsi_register_host(struct exynos_dsi *dsim)
{
struct exynos_dsi_enc *dsi_enc;
dsi_enc = devm_kzalloc(dsim->dev, sizeof(*dsi_enc), GFP_KERNEL);
if (!dsi_enc)
return -ENOMEM;
dsim->priv = dsi_enc;
dsim->bridge.pre_enable_prev_first = true;
return component_add(dsim->dev, &exynos_dsi_component_ops);
}
static void exynos_dsi_unregister_host(struct exynos_dsi *dsim)
{
component_del(dsim->dev, &exynos_dsi_component_ops);
}
static int generic_dsim_register_host(struct exynos_dsi *dsim)
{
return mipi_dsi_host_register(&dsim->dsi_host);
}
static void generic_dsim_unregister_host(struct exynos_dsi *dsim)
{
mipi_dsi_host_unregister(&dsim->dsi_host);
}
static const struct exynos_dsim_host_ops generic_dsim_host_ops = {
.register_host = generic_dsim_register_host,
.unregister_host = generic_dsim_unregister_host,
};
static const struct drm_bridge_timings dsim_bridge_timings_de_low = {
.input_bus_flags = DRM_BUS_FLAG_DE_LOW,
};
......@@ -1892,7 +1970,9 @@ static int exynos_dsi_probe(struct platform_device *pdev)
if (dsi->plat_data->hw_type == DSIM_TYPE_IMX8MM)
dsi->bridge.timings = &dsim_bridge_timings_de_low;
ret = component_add(dev, &exynos_dsi_component_ops);
if (dsi->plat_data->host_ops && dsi->plat_data->host_ops->register_host)
ret = dsi->plat_data->host_ops->register_host(dsi);
if (ret)
goto err_disable_runtime;
......@@ -1983,24 +2063,36 @@ static const struct dev_pm_ops exynos_dsi_pm_ops = {
pm_runtime_force_resume)
};
static const struct exynos_dsim_host_ops exynos_dsi_host_ops = {
.register_host = exynos_dsi_register_host,
.unregister_host = exynos_dsi_unregister_host,
.attach = exynos_dsim_host_attach,
.detach = exynos_dsim_host_detach,
};
static const struct exynos_dsi_plat_data exynos3250_dsi_pdata = {
.hw_type = DSIM_TYPE_EXYNOS3250,
.host_ops = &exynos_dsi_host_ops,
};
static const struct exynos_dsi_plat_data exynos4210_dsi_pdata = {
.hw_type = DSIM_TYPE_EXYNOS4210,
.host_ops = &exynos_dsi_host_ops,
};
static const struct exynos_dsi_plat_data exynos5410_dsi_pdata = {
.hw_type = DSIM_TYPE_EXYNOS5410,
.host_ops = &exynos_dsi_host_ops,
};
static const struct exynos_dsi_plat_data exynos5422_dsi_pdata = {
.hw_type = DSIM_TYPE_EXYNOS5422,
.host_ops = &exynos_dsi_host_ops,
};
static const struct exynos_dsi_plat_data exynos5433_dsi_pdata = {
.hw_type = DSIM_TYPE_EXYNOS5433,
.host_ops = &exynos_dsi_host_ops,
};
static const struct of_device_id exynos_dsi_of_match[] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7