* Re: [PATCH 1/2] drm/vc4: Fix build error with undefined label [not found] <20230308093408.239331-1-qingqing.zhuo@amd.com> @ 2023-03-08 16:11 ` Hamza Mahfooz 2023-03-08 16:19 ` Maxime Ripard 0 siblings, 1 reply; 7+ messages in thread From: Hamza Mahfooz @ 2023-03-08 16:11 UTC (permalink / raw) To: Qingqing Zhuo, amd-gfx Cc: Emma Anholt, David Airlie, Maxime Ripard, Daniel Vetter, dri-devel, linux-kernel + vc4 maintainers On 3/8/23 04:34, Qingqing Zhuo wrote: > [Why] > drivers/gpu/drm/vc4/vc4_hdmi.c: In function ‘vc4_hdmi_bind’: > drivers/gpu/drm/vc4/vc4_hdmi.c:3448:17: error: label ‘err_disable_runtime_pm’ used but not defined > > [How] > update err_disable_runtime_pm to err_put_runtime_pm. > > Signed-off-by: Qingqing Zhuo <qingqing.zhuo@amd.com> > --- > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index 9e145690c480..edf882360d24 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -3445,7 +3445,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) > */ > ret = pm_runtime_resume_and_get(dev); > if (ret) > - goto err_disable_runtime_pm; > + goto err_put_runtime_pm; > > if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") || > of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1")) && -- Hamza ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm/vc4: Fix build error with undefined label 2023-03-08 16:11 ` [PATCH 1/2] drm/vc4: Fix build error with undefined label Hamza Mahfooz @ 2023-03-08 16:19 ` Maxime Ripard 2023-03-08 16:27 ` Zhuo, Qingqing (Lillian) 0 siblings, 1 reply; 7+ messages in thread From: Maxime Ripard @ 2023-03-08 16:19 UTC (permalink / raw) To: Hamza Mahfooz Cc: Qingqing Zhuo, amd-gfx, Emma Anholt, David Airlie, Daniel Vetter, dri-devel, linux-kernel Hi, On Wed, Mar 08, 2023 at 11:11:22AM -0500, Hamza Mahfooz wrote: > + vc4 maintainers > > On 3/8/23 04:34, Qingqing Zhuo wrote: > > [Why] > > drivers/gpu/drm/vc4/vc4_hdmi.c: In function ‘vc4_hdmi_bind’: > > drivers/gpu/drm/vc4/vc4_hdmi.c:3448:17: error: label ‘err_disable_runtime_pm’ used but not defined > > > > [How] > > update err_disable_runtime_pm to err_put_runtime_pm. > > > > Signed-off-by: Qingqing Zhuo <qingqing.zhuo@amd.com> > > --- > > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > > index 9e145690c480..edf882360d24 100644 > > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > > @@ -3445,7 +3445,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) > > */ > > ret = pm_runtime_resume_and_get(dev); > > if (ret) > > - goto err_disable_runtime_pm; > > + goto err_put_runtime_pm; > > if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") || > > of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1")) && The current drm-misc-next branch doesn't have that context at all. What tree is this based on? Maxime ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH 1/2] drm/vc4: Fix build error with undefined label 2023-03-08 16:19 ` Maxime Ripard @ 2023-03-08 16:27 ` Zhuo, Qingqing (Lillian) 2023-03-08 16:32 ` Maxime Ripard 0 siblings, 1 reply; 7+ messages in thread From: Zhuo, Qingqing (Lillian) @ 2023-03-08 16:27 UTC (permalink / raw) To: Maxime Ripard, Mahfooz, Hamza Cc: amd-gfx, Emma Anholt, David Airlie, Daniel Vetter, dri-devel, linux-kernel [AMD Official Use Only - General] > Hi, On Wed, Mar 08, 2023 at 11:11:22AM -0500, Hamza Mahfooz wrote: > + vc4 maintainers > > On 3/8/23 04:34, Qingqing Zhuo wrote: > > [Why] > > drivers/gpu/drm/vc4/vc4_hdmi.c: In function ‘vc4_hdmi_bind’: > > drivers/gpu/drm/vc4/vc4_hdmi.c:3448:17: error: label > > ‘err_disable_runtime_pm’ used but not defined > > > > [How] > > update err_disable_runtime_pm to err_put_runtime_pm. > > > > Signed-off-by: Qingqing Zhuo <qingqing.zhuo@amd.com> > > --- > > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c > > b/drivers/gpu/drm/vc4/vc4_hdmi.c index 9e145690c480..edf882360d24 > > 100644 > > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > > @@ -3445,7 +3445,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) > > */ > > ret = pm_runtime_resume_and_get(dev); > > if (ret) > > - goto err_disable_runtime_pm; > > + goto err_put_runtime_pm; > > if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") || > > of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1")) > > && > The current drm-misc-next branch doesn't have that context at all. What tree is this based on? > Maxime Hi Maxime, This is for amd-staging-drm-next. Thanks, Lillian ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm/vc4: Fix build error with undefined label 2023-03-08 16:27 ` Zhuo, Qingqing (Lillian) @ 2023-03-08 16:32 ` Maxime Ripard 2023-03-08 16:39 ` Alex Deucher 0 siblings, 1 reply; 7+ messages in thread From: Maxime Ripard @ 2023-03-08 16:32 UTC (permalink / raw) To: Zhuo, Qingqing (Lillian) Cc: Mahfooz, Hamza, amd-gfx, Emma Anholt, David Airlie, Daniel Vetter, dri-devel, linux-kernel [-- Attachment #1: Type: text/plain, Size: 1611 bytes --] On Wed, Mar 08, 2023 at 04:27:01PM +0000, Zhuo, Qingqing (Lillian) wrote: > [AMD Official Use Only - General] > > > Hi, > > On Wed, Mar 08, 2023 at 11:11:22AM -0500, Hamza Mahfooz wrote: > > + vc4 maintainers > > > > On 3/8/23 04:34, Qingqing Zhuo wrote: > > > [Why] > > > drivers/gpu/drm/vc4/vc4_hdmi.c: In function ‘vc4_hdmi_bind’: > > > drivers/gpu/drm/vc4/vc4_hdmi.c:3448:17: error: label > > > ‘err_disable_runtime_pm’ used but not defined > > > > > > [How] > > > update err_disable_runtime_pm to err_put_runtime_pm. > > > > > > Signed-off-by: Qingqing Zhuo <qingqing.zhuo@amd.com> > > > --- > > > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c > > > b/drivers/gpu/drm/vc4/vc4_hdmi.c index 9e145690c480..edf882360d24 > > > 100644 > > > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > > > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > > > @@ -3445,7 +3445,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) > > > */ > > > ret = pm_runtime_resume_and_get(dev); > > > if (ret) > > > - goto err_disable_runtime_pm; > > > + goto err_put_runtime_pm; > > > if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") || > > > of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1")) > > > && > > > The current drm-misc-next branch doesn't have that context at all. What tree is this based on? > > This is for amd-staging-drm-next. I don't get it, why is there a vc4 patch in an AMD tree? Maxime [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm/vc4: Fix build error with undefined label 2023-03-08 16:32 ` Maxime Ripard @ 2023-03-08 16:39 ` Alex Deucher 2023-03-08 16:43 ` Zhuo, Qingqing (Lillian) 2023-03-08 16:43 ` Hamza Mahfooz 0 siblings, 2 replies; 7+ messages in thread From: Alex Deucher @ 2023-03-08 16:39 UTC (permalink / raw) To: Maxime Ripard Cc: Zhuo, Qingqing (Lillian), amd-gfx, Emma Anholt, linux-kernel, dri-devel, Mahfooz, Hamza On Wed, Mar 8, 2023 at 11:32 AM Maxime Ripard <maxime@cerno.tech> wrote: > > On Wed, Mar 08, 2023 at 04:27:01PM +0000, Zhuo, Qingqing (Lillian) wrote: > > [AMD Official Use Only - General] > > > > > Hi, > > > > On Wed, Mar 08, 2023 at 11:11:22AM -0500, Hamza Mahfooz wrote: > > > + vc4 maintainers > > > > > > On 3/8/23 04:34, Qingqing Zhuo wrote: > > > > [Why] > > > > drivers/gpu/drm/vc4/vc4_hdmi.c: In function ‘vc4_hdmi_bind’: > > > > drivers/gpu/drm/vc4/vc4_hdmi.c:3448:17: error: label > > > > ‘err_disable_runtime_pm’ used but not defined > > > > > > > > [How] > > > > update err_disable_runtime_pm to err_put_runtime_pm. > > > > > > > > Signed-off-by: Qingqing Zhuo <qingqing.zhuo@amd.com> > > > > --- > > > > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c > > > > b/drivers/gpu/drm/vc4/vc4_hdmi.c index 9e145690c480..edf882360d24 > > > > 100644 > > > > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > > > > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > > > > @@ -3445,7 +3445,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) > > > > */ > > > > ret = pm_runtime_resume_and_get(dev); > > > > if (ret) > > > > - goto err_disable_runtime_pm; > > > > + goto err_put_runtime_pm; > > > > if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") || > > > > of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1")) > > > > && > > > > > The current drm-misc-next branch doesn't have that context at all. What tree is this based on? > > > > This is for amd-staging-drm-next. > > I don't get it, why is there a vc4 patch in an AMD tree? There isn't. it just happens to have an vc4 driver with this issue when we branched it. Lillian, please double check drm-next or linux-next for non-AMD drivers Alex ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH 1/2] drm/vc4: Fix build error with undefined label 2023-03-08 16:39 ` Alex Deucher @ 2023-03-08 16:43 ` Zhuo, Qingqing (Lillian) 2023-03-08 16:43 ` Hamza Mahfooz 1 sibling, 0 replies; 7+ messages in thread From: Zhuo, Qingqing (Lillian) @ 2023-03-08 16:43 UTC (permalink / raw) To: Alex Deucher, Maxime Ripard Cc: amd-gfx, Emma Anholt, linux-kernel, dri-devel, Mahfooz, Hamza [AMD Official Use Only - General] On Wed, Mar 8, 2023 at 11:32 AM Maxime Ripard <maxime@cerno.tech> wrote: > > On Wed, Mar 08, 2023 at 04:27:01PM +0000, Zhuo, Qingqing (Lillian) wrote: > > [AMD Official Use Only - General] > > > > > Hi, > > > > On Wed, Mar 08, 2023 at 11:11:22AM -0500, Hamza Mahfooz wrote: > > > + vc4 maintainers > > > > > > On 3/8/23 04:34, Qingqing Zhuo wrote: > > > > [Why] > > > > drivers/gpu/drm/vc4/vc4_hdmi.c: In function ‘vc4_hdmi_bind’: > > > > drivers/gpu/drm/vc4/vc4_hdmi.c:3448:17: error: label > > > > ‘err_disable_runtime_pm’ used but not defined > > > > > > > > [How] > > > > update err_disable_runtime_pm to err_put_runtime_pm. > > > > > > > > Signed-off-by: Qingqing Zhuo <qingqing.zhuo@amd.com> > > > > --- > > > > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c > > > > b/drivers/gpu/drm/vc4/vc4_hdmi.c index > > > > 9e145690c480..edf882360d24 > > > > 100644 > > > > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > > > > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > > > > @@ -3445,7 +3445,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) > > > > */ > > > > ret = pm_runtime_resume_and_get(dev); > > > > if (ret) > > > > - goto err_disable_runtime_pm; > > > > + goto err_put_runtime_pm; > > > > if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") || > > > > of_device_is_compatible(dev->of_node, > > > > "brcm,bcm2711-hdmi1")) && > > > > > The current drm-misc-next branch doesn't have that context at all. What tree is this based on? > > > > This is for amd-staging-drm-next. > > I don't get it, why is there a vc4 patch in an AMD tree? > There isn't. it just happens to have an vc4 driver with this issue when we branched it. Lillian, please double check drm-next or linux-next for non-AMD drivers Thanks for letting me know and apologies for the confusion! Will for sure do in the future. Thanks, Lillian ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm/vc4: Fix build error with undefined label 2023-03-08 16:39 ` Alex Deucher 2023-03-08 16:43 ` Zhuo, Qingqing (Lillian) @ 2023-03-08 16:43 ` Hamza Mahfooz 1 sibling, 0 replies; 7+ messages in thread From: Hamza Mahfooz @ 2023-03-08 16:43 UTC (permalink / raw) To: Alex Deucher, Maxime Ripard Cc: Zhuo, Qingqing (Lillian), amd-gfx, Emma Anholt, linux-kernel, dri-devel On 3/8/23 11:39, Alex Deucher wrote: > On Wed, Mar 8, 2023 at 11:32 AM Maxime Ripard <maxime@cerno.tech> wrote: >> >> On Wed, Mar 08, 2023 at 04:27:01PM +0000, Zhuo, Qingqing (Lillian) wrote: >>> [AMD Official Use Only - General] >>> >>>> Hi, >>> >>> On Wed, Mar 08, 2023 at 11:11:22AM -0500, Hamza Mahfooz wrote: >>>> + vc4 maintainers >>>> >>>> On 3/8/23 04:34, Qingqing Zhuo wrote: >>>>> [Why] >>>>> drivers/gpu/drm/vc4/vc4_hdmi.c: In function ‘vc4_hdmi_bind’: >>>>> drivers/gpu/drm/vc4/vc4_hdmi.c:3448:17: error: label >>>>> ‘err_disable_runtime_pm’ used but not defined >>>>> >>>>> [How] >>>>> update err_disable_runtime_pm to err_put_runtime_pm. >>>>> >>>>> Signed-off-by: Qingqing Zhuo <qingqing.zhuo@amd.com> >>>>> --- >>>>> drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- >>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>> >>>>> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c >>>>> b/drivers/gpu/drm/vc4/vc4_hdmi.c index 9e145690c480..edf882360d24 >>>>> 100644 >>>>> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c >>>>> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c >>>>> @@ -3445,7 +3445,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) >>>>> */ >>>>> ret = pm_runtime_resume_and_get(dev); >>>>> if (ret) >>>>> - goto err_disable_runtime_pm; >>>>> + goto err_put_runtime_pm; >>>>> if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") || >>>>> of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1")) >>>>> && >>> >>>> The current drm-misc-next branch doesn't have that context at all. What tree is this based on? >>> >>> This is for amd-staging-drm-next. >> >> I don't get it, why is there a vc4 patch in an AMD tree? > > There isn't. it just happens to have an vc4 driver with this issue > when we branched it. Lillian, please double check drm-next or > linux-next for non-AMD drivers I think we can cherry pick commit 932d860f4672 ("drm/vc4: hdmi: Switch to devm_pm_runtime_enable") to resolve the compile issue, that Lillian is observing. > > Alex -- Hamza ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-03-08 16:43 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20230308093408.239331-1-qingqing.zhuo@amd.com>
2023-03-08 16:11 ` [PATCH 1/2] drm/vc4: Fix build error with undefined label Hamza Mahfooz
2023-03-08 16:19 ` Maxime Ripard
2023-03-08 16:27 ` Zhuo, Qingqing (Lillian)
2023-03-08 16:32 ` Maxime Ripard
2023-03-08 16:39 ` Alex Deucher
2023-03-08 16:43 ` Zhuo, Qingqing (Lillian)
2023-03-08 16:43 ` Hamza Mahfooz
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®