redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

MLK-15321-4 drm/imx: core: Add bliteng as component of imx-drm 

Implement Blt engine as DRM renderer.
Add dpu bliteng as component of imx-drm.

Signed-off-by: Adrian Negreanu <adrian.negreanu@nxp.com>
Signed-off-by: Marius Vlad <marius-cristian.vlad@nxp.com>
Signed-off-by: Meng Mingming <mingming.meng@nxp.com>
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
5.4-rM2-2.2.x-imx-squashed
Xianzhong 2019-08-14 01:06:01 +08:00 committed by Dong Aisheng
parent f61b12ef75
commit 34e7158489
1 changed files with 111 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
drivers/gpu/drm/imx/imx-drm-core.c
View File

@ -185,6 +185,13 @@ static int compare_of(struct device *dev, void *data)
return pdata->of_node == np;
}
/* This is a special case for dpu bliteng. */
if (strcmp(dev->driver->name, "imx-drm-dpu-bliteng") == 0) {
struct dpu_client_platformdata *pdata = dev->platform_data;
return pdata->of_node == np;
}
/* Special case for LDB, one device for two channels */
if (of_node_name_eq(np, "lvds-channel")) {
np = of_get_parent(np);
@ -194,11 +201,104 @@ static int compare_of(struct device *dev, void *data)
return dev->of_node == np;
}
static const char *const imx_drm_dpu_comp_parents[] = {
"fsl,imx8qm-dpu",
"fsl,imx8qxp-dpu",
};
static bool imx_drm_parent_is_compatible(struct device *dev,
const char *const comp_parents[],
int comp_parents_size)
{
struct device_node *port, *parent;
bool ret = false;
int i;
port = of_parse_phandle(dev->of_node, "ports", 0);
if (!port)
return ret;
parent = of_get_parent(port);
for (i = 0; i < comp_parents_size; i++) {
if (of_device_is_compatible(parent, comp_parents[i])) {
ret = true;
break;
}
}
of_node_put(parent);
of_node_put(port);
return ret;
}
static inline bool has_dpu(struct device *dev)
{
return imx_drm_parent_is_compatible(dev, imx_drm_dpu_comp_parents,
ARRAY_SIZE(imx_drm_dpu_comp_parents));
}
static void add_dpu_bliteng_components(struct device *dev,
struct component_match **matchptr)
{
/*
* As there may be two dpu bliteng device,
* so need add something in compare data to distinguish.
* Use its parent dpu's of_node as the data here.
*/
struct device_node *port, *parent;
/* assume max dpu number is 8 */
struct device_node *dpu[8];
int num_dpu = 0;
int i, j;
bool found = false;
for (i = 0; ; i++) {
port = of_parse_phandle(dev->of_node, "ports", i);
if (!port)
break;
parent = of_get_parent(port);
for (j = 0; j < num_dpu; j++) {
if (dpu[j] == parent) {
found = true;
break;
}
}
if (found) {
found = false;
} else {
if (num_dpu >= ARRAY_SIZE(dpu)) {
dev_err(dev, "The number of found dpu is greater than max [%ld].\n",
ARRAY_SIZE(dpu));
of_node_put(parent);
of_node_put(port);
break;
}
dpu[num_dpu] = parent;
num_dpu++;
component_match_add(dev, matchptr, compare_of, parent);
}
of_node_put(parent);
of_node_put(port);
}
}
static int imx_drm_bind(struct device *dev)
{
struct drm_device *drm;
int ret;
if (has_dpu(dev))
imx_drm_driver.driver_features |= DRIVER_RENDER;
drm = drm_dev_alloc(&imx_drm_driver, dev);
if (IS_ERR(drm))
return PTR_ERR(drm);
@ -277,6 +377,9 @@ static void imx_drm_unbind(struct device *dev)
{
struct drm_device *drm = dev_get_drvdata(dev);
if (has_dpu(dev))
imx_drm_driver.driver_features &= ~DRIVER_RENDER;
drm_dev_unregister(drm);
drm_kms_helper_poll_fini(drm);
@ -296,7 +399,14 @@ static const struct component_master_ops imx_drm_ops = {
static int imx_drm_platform_probe(struct platform_device *pdev)
{
int ret = drm_of_component_probe(&pdev->dev, compare_of, &imx_drm_ops);
struct component_match *match = NULL;
int ret;
if (has_dpu(&pdev->dev))
add_dpu_bliteng_components(&pdev->dev, &match);
ret = drm_of_component_probe_with_match(&pdev->dev, match, compare_of,
&imx_drm_ops);
if (!ret)
ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));