From: Lyude Paul Subject: [RFC v3 04/11] drm/nouveau/kms/nv50-: Unroll error cleanup in nv50_head_create() Date: Fri, 17 Apr 2020 15:40:51 -0400 Message-ID: <20200417194145.36350-5-lyude@redhat.com> References: <20200417194145.36350-1-lyude@redhat.com> Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <20200417194145.36350-1-lyude@redhat.com> Sender: linux-kernel-owner@vger.kernel.org To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter , Ben Skeggs , David Airlie , Ilia Mirkin , Thomas Zimmermann , Peteris Rudzusiks , Maarten Lankhorst , nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: nouveau.vger.kernel.org We'll be rolling back more things in this function, and the way it's structured is a bit confusing. So, let's clean this up a bit and just unroll in the event of failure. Signed-off-by: Lyude Paul --- drivers/gpu/drm/nouveau/dispnv50/head.c | 33 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/no= uveau/dispnv50/head.c index 8f6455697ba7..e29ea40e7c33 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/head.c +++ b/drivers/gpu/drm/nouveau/dispnv50/head.c @@ -507,20 +507,28 @@ nv50_head_create(struct drm_device *dev, int index) =20 if (disp->disp->object.oclass < GV100_DISP) { ret =3D nv50_base_new(drm, head->base.index, &base); + if (ret) + goto fail_free; + ret =3D nv50_ovly_new(drm, head->base.index, &ovly); + if (ret) + goto fail_free; } else { ret =3D nv50_wndw_new(drm, DRM_PLANE_TYPE_PRIMARY, head->base.index * 2 + 0, &base); + if (ret) + goto fail_free; + ret =3D nv50_wndw_new(drm, DRM_PLANE_TYPE_OVERLAY, head->base.index * 2 + 1, &ovly); - } - if (ret =3D=3D 0) - ret =3D nv50_curs_new(drm, head->base.index, &curs); - if (ret) { - kfree(head); - return ERR_PTR(ret); + if (ret) + goto fail_free; } =20 + ret =3D nv50_curs_new(drm, head->base.index, &curs); + if (ret) + goto fail_free; + crtc =3D &head->base.base; drm_crtc_init_with_planes(dev, crtc, &base->plane, &curs->plane, &nv50_head_func, "head-%d", head->base.index); @@ -533,11 +541,16 @@ nv50_head_create(struct drm_device *dev, int index) =20 if (head->func->olut_set) { ret =3D nv50_lut_init(disp, &drm->client.mmu, &head->olut); - if (ret) { - nv50_head_destroy(crtc); - return ERR_PTR(ret); - } + if (ret) + goto fail_crtc_cleanup; } =20 return head; + +fail_crtc_cleanup: + drm_crtc_cleanup(crtc); +fail_free: + kfree(head); + + return ERR_PTR(ret); } --=20 2.25.1