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