From patchwork Tue Oct 24 14:00:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 10024653 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 56779604D7 for ; Tue, 24 Oct 2017 14:00:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D7082841E for ; Tue, 24 Oct 2017 14:00:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 41F6A288D8; Tue, 24 Oct 2017 14:00:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 12ADE2841E for ; Tue, 24 Oct 2017 14:00:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 28E9E6E512; Tue, 24 Oct 2017 14:00:24 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.web.de (mout.web.de [212.227.17.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0D5B76E50C; Tue, 24 Oct 2017 14:00:21 +0000 (UTC) Received: from [192.168.1.2] ([92.227.117.134]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MQNeK-1ddGZk3Sfc-00TjsU; Tue, 24 Oct 2017 16:00:13 +0200 Subject: [PATCH 2/2] drm/i915/dp: Use common error handling code in intel_dp_sink_crc_stop() From: SF Markus Elfring To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, David Airlie , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi References: <668a4b56-091d-d4e7-2204-daaec6675e11@users.sourceforge.net> Message-ID: <1d3d0395-957a-2a87-3cb5-0d7355d04b65@users.sourceforge.net> Date: Tue, 24 Oct 2017 16:00:11 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <668a4b56-091d-d4e7-2204-daaec6675e11@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:ibvTG5rG0VU79E4UVPgrWg0ufLGiNhqQUa8UplrkbaaSVbBn4wY b+GRdiM/te3x10s+7oIcLCE1tKg2wWw2W9rtC29Noqh/PMlT3o6t8R3FXPYCpZgnfY0YMUQ NIr9bcPKZ43QEe9qk2Vy386v6x6RQPmNsjrzgrBEgJ2SsN2kwpqLL+C8ZJeVu6QNUcJcPTH 14YY0OK3UhPEYejjaJ3xw== X-UI-Out-Filterresults: notjunk:1; V01:K0:3XtFwRm+Zl4=:Qg81Nqi1ZpNLaGnLvM7wI4 HXysKh0gaGzZgUrV9xxqqkiSoqVOi37GGgL+l4Xc2ycZ77YM9Y/qIGSjD13gEC1qAWJAZmxOu le/Qu8EPC/Okqa4bg5NcC0GvSZpT000kWxzFyqtp95Z38vL/wqqF9ezj99uMmHRtrlyUp3veF EWqHFjbsZqHfQuGLuAaApJIQg8d8cOeeleP7VTRErzq0kmcVduUQfpPsyimjiK6gGuEbWsMXg LEn1gWWmz6O4Ceq6NUZE9C54cCz0wq9VOyPNDWL1rd1LMPRLL3wGec1pYMB7b6/vcxb60ljYF A4qdKAV3Acr+9UgWHXUr1UCw4uyf4csazqSa1OI5hGQXzgTA0Pna6ruvQI9zc38iQ/0Hfxo5J mLjdXwJNYkaerYp0pP9QrwUrKFgQwT2ryPQTqBjzNNEZOY4VkdbtFYTuNN5rg5waulZCU5J1a GUu3G2BcHSP2DD4RkpvI3GwtkJfkJkuM1Re4lhD/726gwpcpTeOcUfht/e/zoAkDZoSJTwB5d 9MOa0aKtGVdcozFUaeLBDtt+7IuttsTSemzkJmXL3q/sK5q9d5vcumYSJ0AR8eEeiZngUykt1 By6FPSS/JT9pLc8sOWU/EErdeKn3Yo68nPW+4nfOaDhcTrROKrStaE0j2BndYkVpYqkL9Tqy2 9324pGuydjzsgQKaU7RSJZ5sH/KxOZe8tviOjiHj5UtEuVb9K7dDKORLxPmLb7jL2GYWz5ZQL Ly7gZ9lvpFgJhV3LK4BsGIwaIasVR2yO91P3dMeOVdXMD293jlMQIvzBIVBBaqLuFVLO2GrIV 1jZ43TOEXnH1fvPi7XqOZSEqefuvol8jNJxV+tpkxlsnLQ2e9o= Cc: kernel-janitors@vger.kernel.org, LKML X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Tue, 24 Oct 2017 15:40:47 +0200 Adjust jump targets so that a specific error code assignment will be in the implementation only at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/gpu/drm/i915/intel_dp.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 342f1a1fa085..3dd514a77008 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -3894,27 +3894,19 @@ static int intel_dp_sink_crc_stop(struct intel_dp *intel_dp) int count = 0; int attempts = 10; - if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf) < 0) { - DRM_DEBUG_KMS("Sink CRC couldn't be stopped properly\n"); - ret = -EIO; - goto out; - } + if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf) < 0) + goto report_failure; if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_SINK, - buf & ~DP_TEST_SINK_START) < 0) { - DRM_DEBUG_KMS("Sink CRC couldn't be stopped properly\n"); - ret = -EIO; - goto out; - } + buf & ~DP_TEST_SINK_START) < 0) + goto report_failure; do { intel_wait_for_vblank(dev_priv, intel_crtc->pipe); + if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK_MISC, &buf) + < 0) + goto e_io; - if (drm_dp_dpcd_readb(&intel_dp->aux, - DP_TEST_SINK_MISC, &buf) < 0) { - ret = -EIO; - goto out; - } count = buf & DP_TEST_COUNT_MASK; } while (--attempts && count); @@ -3923,9 +3915,15 @@ static int intel_dp_sink_crc_stop(struct intel_dp *intel_dp) ret = -ETIMEDOUT; } - out: +enable_ips: hsw_enable_ips(intel_crtc); return ret; + +report_failure: + DRM_DEBUG_KMS("Sink CRC couldn't be stopped properly\n"); +e_io: + ret = -EIO; + goto enable_ips; } static int intel_dp_sink_crc_start(struct intel_dp *intel_dp)