Commit 5b0ef98e authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Chun-Kuang Hu

drm/mediatek: Test component initialization earlier in the function mtk_drm_crtc_create

The initialization is currently tested in a later stage in
the function for no reason.
In addition, the test '!comp' will never fail since comp is
set with the '&' operator. Instead, test if a comp was not
initialized by testing "!comp->dev".
Signed-off-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 58e4c539
...@@ -755,14 +755,22 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, ...@@ -755,14 +755,22 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
for (i = 0; i < path_len; i++) { for (i = 0; i < path_len; i++) {
enum mtk_ddp_comp_id comp_id = path[i]; enum mtk_ddp_comp_id comp_id = path[i];
struct device_node *node; struct device_node *node;
struct mtk_ddp_comp *comp;
node = priv->comp_node[comp_id]; node = priv->comp_node[comp_id];
comp = &priv->ddp_comp[comp_id];
if (!node) { if (!node) {
dev_info(dev, dev_info(dev,
"Not creating crtc %d because component %d is disabled or missing\n", "Not creating crtc %d because component %d is disabled or missing\n",
pipe, comp_id); pipe, comp_id);
return 0; return 0;
} }
if (!comp->dev) {
dev_err(dev, "Component %pOF not initialized\n", node);
return -ENODEV;
}
} }
mtk_crtc = devm_kzalloc(dev, sizeof(*mtk_crtc), GFP_KERNEL); mtk_crtc = devm_kzalloc(dev, sizeof(*mtk_crtc), GFP_KERNEL);
...@@ -787,16 +795,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, ...@@ -787,16 +795,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) { for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {
enum mtk_ddp_comp_id comp_id = path[i]; enum mtk_ddp_comp_id comp_id = path[i];
struct mtk_ddp_comp *comp; struct mtk_ddp_comp *comp;
struct device_node *node;
node = priv->comp_node[comp_id];
comp = &priv->ddp_comp[comp_id]; comp = &priv->ddp_comp[comp_id];
if (!comp) {
dev_err(dev, "Component %pOF not initialized\n", node);
ret = -ENODEV;
return ret;
}
mtk_crtc->ddp_comp[i] = comp; mtk_crtc->ddp_comp[i] = comp;
if (comp->funcs) { if (comp->funcs) {
......
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