MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-13 20:59:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/arm/komeda: Fix komeda probe failing if there are no links in the secondary pipeline

Browse Source 
[ Upstream commit 9054c46d47 ]

Since commit 4cfe5cc02e ("drm/arm/komeda: Remove component framework and
add a simple encoder"), the devm_drm_of_get_bridge() call happens
regardless of whether any remote nodes are available on the pipeline. Fix
this by moving the bridge attach to its own function and calling it
conditional on there being an output link.

Fixes: 4cfe5cc02e ("drm/arm/komeda: Remove component framework and add a simple encoder")
Signed-off-by: Faiz Abbas <faiz.abbas@arm.com>
[Corrected Commit-id of the fixed patch to match mainline]
Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
Acked-by: Liviu Dudau <liviu.dudau@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240219100915.192475-2-faiz.abbas@arm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Faiz Abbas 2024-02-19 15:39:13 +05:30 committed by Greg Kroah-Hartman
parent 86d201285a
commit 5b78b88aa0
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
View File

@ -5,6 +5,7 @@
* *
*/ */
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/of.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
@ -610,12 +611,34 @@ get_crtc_primary(struct komeda_kms_dev *kms, struct komeda_crtc *crtc)
return NULL; return NULL;
} }
static int komeda_attach_bridge(struct device *dev,
struct komeda_pipeline *pipe,
struct drm_encoder *encoder)
{
struct drm_bridge *bridge;
int err;
bridge = devm_drm_of_get_bridge(dev, pipe->of_node,
KOMEDA_OF_PORT_OUTPUT, 0);
if (IS_ERR(bridge))
return dev_err_probe(dev, PTR_ERR(bridge), "remote bridge not found for pipe: %s\n",
of_node_full_name(pipe->of_node));
err = drm_bridge_attach(encoder, bridge, NULL, 0);
if (err)
dev_err(dev, "bridge_attach() failed for pipe: %s\n",
of_node_full_name(pipe->of_node));
return err;
}
static int komeda_crtc_add(struct komeda_kms_dev *kms, static int komeda_crtc_add(struct komeda_kms_dev *kms,
struct komeda_crtc *kcrtc) struct komeda_crtc *kcrtc)
{ {
struct drm_crtc *crtc = &kcrtc->base; struct drm_crtc *crtc = &kcrtc->base;
struct drm_device *base = &kms->base; struct drm_device *base = &kms->base;
struct drm_bridge *bridge; struct komeda_pipeline *pipe = kcrtc->master;
struct drm_encoder *encoder = &kcrtc->encoder;
int err; int err;
err = drm_crtc_init_with_planes(base, crtc, err = drm_crtc_init_with_planes(base, crtc,
@ -626,27 +649,25 @@ static int komeda_crtc_add(struct komeda_kms_dev *kms,
drm_crtc_helper_add(crtc, &komeda_crtc_helper_funcs); drm_crtc_helper_add(crtc, &komeda_crtc_helper_funcs);
crtc->port = kcrtc->master->of_output_port; crtc->port = pipe->of_output_port;
/* Construct an encoder for each pipeline and attach it to the remote /* Construct an encoder for each pipeline and attach it to the remote
* bridge * bridge
*/ */
kcrtc->encoder.possible_crtcs = drm_crtc_mask(crtc); kcrtc->encoder.possible_crtcs = drm_crtc_mask(crtc);
err = drm_simple_encoder_init(base, &kcrtc->encoder, err = drm_simple_encoder_init(base, encoder, DRM_MODE_ENCODER_TMDS);
DRM_MODE_ENCODER_TMDS);
if (err) if (err)
return err; return err;
bridge = devm_drm_of_get_bridge(base->dev, kcrtc->master->of_node, if (pipe->of_output_links[0]) {
KOMEDA_OF_PORT_OUTPUT, 0); err = komeda_attach_bridge(base->dev, pipe, encoder);
if (IS_ERR(bridge)) if (err)
return PTR_ERR(bridge); return err;
}
err = drm_bridge_attach(&kcrtc->encoder, bridge, NULL, 0);
drm_crtc_enable_color_mgmt(crtc, 0, true, KOMEDA_COLOR_LUT_SIZE); drm_crtc_enable_color_mgmt(crtc, 0, true, KOMEDA_COLOR_LUT_SIZE);
return err; return 0;
} }
int komeda_kms_add_crtcs(struct komeda_kms_dev *kms, struct komeda_dev *mdev) int komeda_kms_add_crtcs(struct komeda_kms_dev *kms, struct komeda_dev *mdev)