Re: [PATCH 1/2] drm/vc4: Fix build error with undefined label

Re: [PATCH 1/2] drm/vc4: Fix build error with undefined label

[Hamza Mahfooz]

+ 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

Re: [PATCH 1/2] drm/vc4: Fix build error with undefined label

[Maxime Ripard]

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

RE: [PATCH 1/2] drm/vc4: Fix build error with undefined label

[Zhuo, Qingqing (Lillian)]

[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

Re: [PATCH 1/2] drm/vc4: Fix build error with undefined label

[Maxime Ripard]

[-- 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 --]

Re: [PATCH 1/2] drm/vc4: Fix build error with undefined label

[Alex Deucher]

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

RE: [PATCH 1/2] drm/vc4: Fix build error with undefined label

[Zhuo, Qingqing (Lillian)]

[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

Re: [PATCH 1/2] drm/vc4: Fix build error with undefined label

[Hamza Mahfooz]

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