From nobody Mon Feb 9 03:45:41 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C8C95288DF for ; Mon, 19 Feb 2024 10:09:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708337374; cv=none; b=IAL17uBOiElTKYoFk/fs3sxhoicMgLsw2EahaOEkYT3tviN5cgrgIU4r2yYO6jNBoO0nGyeU8AOEx2KiCRl/+WhPgfWG6M1m+so80FiZpcUHYZ02Lf0j6iE5b/L+hXx/oS6PqQ0GLLb5F0tV0GPnZKfEo04bat54WeaZylp68ws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708337374; c=relaxed/simple; bh=fPKK7lbxTJQg2HozRmLSmLdED3dVOb6syBUEw/ZUhuw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BiDHcX/I48g/NRQVxrKtPyDMx+94iEOkJ8rUVjVI/gRm2vnzi7nok6Cdwl4TCuCP6ptJXwOrPPDEy0kSADeOwO38yTGy2hB8p5EM1g0FU0L0VPws0SB4y+2C2ETvewgpICNvJpa1eVDStDctHnsfRWIchLJa52yPah2Mhv7wI/I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D454E1FB; Mon, 19 Feb 2024 02:10:11 -0800 (PST) Received: from a077854.blr.arm.com (a077854.arm.com [10.162.41.80]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5D45B3F762; Mon, 19 Feb 2024 02:09:29 -0800 (PST) From: Faiz Abbas To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, Faiz Abbas Subject: [PATCH 1/3] drm/arm/komeda: Fix komeda probe failing if there are no links in the secondary pipeline Date: Mon, 19 Feb 2024 15:39:13 +0530 Message-Id: <20240219100915.192475-2-faiz.abbas@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240219100915.192475-1-faiz.abbas@arm.com> References: <20240219100915.192475-1-faiz.abbas@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since commit f7936d6beda9 ("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: f7936d6beda9 ("drm/arm/komeda: Remove component framework and add a = simple encoder") Signed-off-by: Faiz Abbas --- .../gpu/drm/arm/display/komeda/komeda_crtc.c | 43 ++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu= /drm/arm/display/komeda/komeda_crtc.c index 2c661f28410e..b645c5998230 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -5,6 +5,7 @@ * */ #include +#include #include #include =20 @@ -610,12 +611,34 @@ get_crtc_primary(struct komeda_kms_dev *kms, struct k= omeda_crtc *crtc) return NULL; } =20 +static int komeda_attach_bridge(struct device *dev, + struct komeda_pipeline *pipe, + struct drm_encoder *encoder) +{ + struct drm_bridge *bridge; + int err; + + bridge =3D 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 =3D 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, struct komeda_crtc *kcrtc) { struct drm_crtc *crtc =3D &kcrtc->base; struct drm_device *base =3D &kms->base; - struct drm_bridge *bridge; + struct komeda_pipeline *pipe =3D kcrtc->master; + struct drm_encoder *encoder =3D &kcrtc->encoder; int err; =20 err =3D drm_crtc_init_with_planes(base, crtc, @@ -626,27 +649,25 @@ static int komeda_crtc_add(struct komeda_kms_dev *kms, =20 drm_crtc_helper_add(crtc, &komeda_crtc_helper_funcs); =20 - crtc->port =3D kcrtc->master->of_output_port; + crtc->port =3D pipe->of_output_port; =20 /* Construct an encoder for each pipeline and attach it to the remote * bridge */ kcrtc->encoder.possible_crtcs =3D drm_crtc_mask(crtc); - err =3D drm_simple_encoder_init(base, &kcrtc->encoder, - DRM_MODE_ENCODER_TMDS); + err =3D drm_simple_encoder_init(base, encoder, DRM_MODE_ENCODER_TMDS); if (err) return err; =20 - bridge =3D devm_drm_of_get_bridge(base->dev, kcrtc->master->of_node, - KOMEDA_OF_PORT_OUTPUT, 0); - if (IS_ERR(bridge)) - return PTR_ERR(bridge); - - err =3D drm_bridge_attach(&kcrtc->encoder, bridge, NULL, 0); + if (pipe->of_output_links[0]) { + err =3D komeda_attach_bridge(base->dev, pipe, encoder); + if (err) + return err; + } =20 drm_crtc_enable_color_mgmt(crtc, 0, true, KOMEDA_COLOR_LUT_SIZE); =20 - return err; + return 0; } =20 int komeda_kms_add_crtcs(struct komeda_kms_dev *kms, struct komeda_dev *md= ev) --=20 2.25.1