From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 503981E519 for ; Wed, 6 Mar 2024 13:44:00 +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=1709732643; cv=none; b=a1CO+Iz/Q/0bktebmqzuRtPGfgkSw+Z86NOQgUtZ7p2fAEL0JBsyb7Iypp41qdQD1svFEx3XqoaC+sTrVvlAmL6ukrB6Br17WCrC0Cy4kchM5OuAUsqFfdmz1oQBJu2tojByijcOB0aSSZqguO5zk/vP9Rn7EEoVYCBsGur+UfI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709732643; c=relaxed/simple; bh=mcmnmPXyMNiVIeIiXI0Qnxdb4QPZACHJTPxMZP39N7U=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=qD2sGtBd2+UgFZo5JrRaTkWHWEn1EC7YASmuuT0hvbhaL3fI5cKhhowWX41PRaHbOBY98TQQfVdiHBhDBelT0WevWaPN288PC+TmqiNrGH/dpzIKnzq79aWKlqBcczOw6RDMIecxoxVwTCwIxuDKRI+JOmAvvuyKETaba0eVb0Y= 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 63D9B1FB for ; Wed, 6 Mar 2024 05:44:36 -0800 (PST) Received: from e110455-lin.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E38F63F762 for ; Wed, 6 Mar 2024 05:43:58 -0800 (PST) Date: Wed, 6 Mar 2024 13:43:56 +0000 From: Liviu Dudau To: Faiz Abbas Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch Subject: Re: [PATCH 1/3] drm/arm/komeda: Fix komeda probe failing if there are no links in the secondary pipeline Message-ID: References: <20240219100915.192475-1-faiz.abbas@arm.com> <20240219100915.192475-2-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-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240219100915.192475-2-faiz.abbas@arm.com> Hi Faiz, On Mon, Feb 19, 2024 at 03:39:13PM +0530, Faiz Abbas wrote: > 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") I don't know what tree you're using, but the commit that you're quoting here is actually 4cfe5cc02e3f. I will fix it when I merge the patch. Best regards, Liviu > 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 > > @@ -610,12 +611,34 @@ get_crtc_primary(struct komeda_kms_dev *kms, struct komeda_crtc *crtc) > 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, > struct komeda_crtc *kcrtc) > { > struct drm_crtc *crtc = &kcrtc->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; > > 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); > > - 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 > * bridge > */ > kcrtc->encoder.possible_crtcs = drm_crtc_mask(crtc); > - err = drm_simple_encoder_init(base, &kcrtc->encoder, > - DRM_MODE_ENCODER_TMDS); > + err = drm_simple_encoder_init(base, encoder, DRM_MODE_ENCODER_TMDS); > if (err) > return err; > > - bridge = 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 = drm_bridge_attach(&kcrtc->encoder, bridge, NULL, 0); > + if (pipe->of_output_links[0]) { > + err = komeda_attach_bridge(base->dev, pipe, encoder); > + if (err) > + return err; > + } > > 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) > -- > 2.25.1 > -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯