From patchwork Sat Dec 19 17:48:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 11983913 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58E66C2BBCD for ; Sun, 20 Dec 2020 11:10:54 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1555D233E2 for ; Sun, 20 Dec 2020 11:10:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1555D233E2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=web.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD4706E160; Sun, 20 Dec 2020 11:10:52 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.17.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 33A1A89A1E; Sat, 19 Dec 2020 17:56:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1608400567; bh=GxNJHx4zlacY2ZglW3kgLSpBfcaXQIJ9k86DyICNOf4=; h=X-UI-Sender-Class:Subject:From:To:Cc:References:Date:In-Reply-To; b=E8P9NaYXfsw0G9Df3XHwNNTc9zCyq3JLy6jkFymLNsn6iGSzXw8tIJSnpv5+qaUGy qLtpbS87THjYrlsw9cqRQTjwX9xrjg1P27CmErCqiXXxi9cx14OVOVkDiFjPGTWj+/ oVgl3bGP6YZjwrG/QlKNUANLB/8jO2h60MkLqmiI= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.1.2] ([78.49.88.127]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0M0yiR-1jwVSM0boV-00v7iH; Sat, 19 Dec 2020 18:48:37 +0100 Subject: [PATCH 2/2] drm/amd/display: Use common error handling code in dc_create() From: Markus Elfring To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , Alvin Lee , Anthony Koo , Aric Cyr , Aurabindo Pillai , Bhawanpreet Lakha , Chiawen Huang , =?utf-8?q?Christian_K=C3=B6nig?= , Harry Wentland , Leo Li , Nicholas Kazlauskas , Yongqiang Sun , Daniel Vetter , David Airlie References: <98e71ee7-1eb9-ada8-a438-703be03e96d1@web.de> Message-ID: Date: Sat, 19 Dec 2020 18:48:30 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <98e71ee7-1eb9-ada8-a438-703be03e96d1@web.de> Content-Language: en-GB X-Provags-ID: V03:K1:9rclrif6IcSAa65raZ/NV9T3dLClOm5i0WIMsTEQ8nJHZPj2vJA Fhv8fZ8z3REApGfXOSw4pXpYYvaIOznvHOW+rMx+znc8YSG0Guo/TiCvRzXKx2vUfElub7c Tur9kX6/qeVb/+N12pLlEoNJBdngVxh3g2xNC1MKoVCIx+YaCnkkyTEb3iQRBGD5NEei3Kb DEHMhIueWuBfdmgi9dW2w== X-UI-Out-Filterresults: notjunk:1;V03:K0:zqgGCMhpsaY=:Z3LQCCqq0txtlVaG+307l4 BfZTUcll3uh28vZnJknhkfTujGGXsbxHJjJ281F9rjgm3D3GvxIaweMg8Wl7uHfuTpt3C9gke q7d5VyHpZW2mmRoq7miyLwODl6RFcRej8BIm4/YcewCZOCb/rGNapEmNrrLROCwFDWNqtelll EJxx6YPm/I88fVeZcbM8FXMkclm2LDIIwr7Qr8FD5I6hPFDozthlb7CyDB7wmdjsqxHbO5ohF 6BE3RXtaNhYO+bLd1SmzmDE01F8Ksteh9Rphs30W2ulB8DzT2XVKoAKW+I9Cv8hTcY4AHt8Md Sy7lYuC1pr8ZDTv+nwnlDT2UhYJz/wuBAPFDVxbFnZpxUNvpvjGxXyj5Q1Sfse0LFhwXOdxVt oNO5reRKdBil25m0a3JcEU9VmzVB5peKsQ9DlaH0GMHOHIiwRd0N80g5UpJS1T7casasFJKqL oDbJ8NB5cPZXgY1GPnjcqmb1ZDwwok2jA8D7I6PCsb4kFPQfQ3cZnVRONpuCUFht9neqxoExJ vGBHOOqXmH+oNGF1Da9950p5JfETk0o1XinDDstXZyQrjCNISU5k751FPCKV+NhciekS0yzo5 QnCYRQtybDLJsYljfwFVqOFGv4MW77QPqfHGnUNHDxRu3ukJlTc1q+xtE8Z58atl+AK/LLvqV L5MSzpyxYIIolFbputk10hKB+SCoLuesY0jd1OcXO0hR0P5Ks3WfWFVTXcr/r49w2xft6Glk1 Cge/ombWjiTIAiEZSKwhiGTaLMVj/e6xYgXh55B11zXikCHvwnNcYwc7dOmJNqLnW4Mhv8oGo WEuWaYW/7YB5/3aXz42H/obB9qegkYDzHwqvJM5JaehZZ0HvAxP3LWvYzb5lqEVltjCBZtZSd +xt+Z/aQUs0baVKuopeA== X-Mailman-Approved-At: Sun, 20 Dec 2020 11:10:15 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Markus Elfring Date: Sat, 19 Dec 2020 18:18:59 +0100 Adjust a jump target so that a bit of exception handling can be better reused at the end of this function. Signed-off-by: Markus Elfring --- drivers/gpu/drm/amd/display/dc/core/dc.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) -- 2.29.2 diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index e35fbfcb4d0e..64344c054c93 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -968,15 +968,11 @@ struct dc *dc_create(const struct dc_init_data *init_params) return NULL; if (init_params->dce_environment == DCE_ENV_VIRTUAL_HW) { - if (false == dc_construct_ctx(dc, init_params)) { - dc_destruct(dc); - goto construct_fail; - } + if (!dc_construct_ctx(dc, init_params)) + goto destruct_dc; } else { - if (false == dc_construct(dc, init_params)) { - dc_destruct(dc); - goto construct_fail; - } + if (!dc_construct(dc, init_params)) + goto destruct_dc; full_pipe_count = dc->res_pool->pipe_count; if (dc->res_pool->underlay_pipe_index != NO_UNDERLAY_PIPE) @@ -1007,7 +1003,8 @@ struct dc *dc_create(const struct dc_init_data *init_params) return dc; -construct_fail: +destruct_dc: + dc_destruct(dc); kfree(dc); return NULL; }