From patchwork Tue May 7 19:18:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Crouse X-Patchwork-Id: 10933655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 06A0D924 for ; Tue, 7 May 2019 19:18:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAB4228746 for ; Tue, 7 May 2019 19:18:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDFB72894E; Tue, 7 May 2019 19:18: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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9010328746 for ; Tue, 7 May 2019 19:18:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726457AbfEGTSY (ORCPT ); Tue, 7 May 2019 15:18:24 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:50006 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726565AbfEGTSU (ORCPT ); Tue, 7 May 2019 15:18:20 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 26C8A60452; Tue, 7 May 2019 19:18:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1557256699; bh=Q/mJwJuOJwy/EQv6iKT7QRDV1FjoviOEpC04L2Tcpzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=clytPUMUyQJU9mZ3iQJhSorKr4bLOcP19X/kXHXhWA5QX1Mn9B5TzrYviStSM/Nnm M/cPXKYfoYMTpL6i8+uqASwLRSYqdQoYoXcdrng1VTA56bDviWXJsiqbMuIZ8zQSAh B4Gt8uAXZLu25DYls9DvzEO2gELrALW4Cmxny6/4= Received: from jcrouse1-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jcrouse@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 5FC3061194; Tue, 7 May 2019 19:18:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1557256697; bh=Q/mJwJuOJwy/EQv6iKT7QRDV1FjoviOEpC04L2Tcpzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eF8zL64FNZTGzDK9ZVMecOUGA2iNRn2Jc8k37M/rPgQq742AAsyBP6rCz7puQVNAY TYI1gGniTkn5FVCIzdmk0WaxThd4R+ipmv+dfqGdm+ihRkyWhUsp+WKM2NxtyOwsbq nXzAjIFCB1ZgUal4J6Ct1Er17YcC8QJnthfZL4Rw= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 5FC3061194 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jcrouse@codeaurora.org From: Jordan Crouse To: freedreno@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, Sean Paul , Kees Cook , Chandan Uddaraju , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Jeykumar Sankaran , "Gustavo A. R. Silva" , Rob Clark , David Airlie , Rajesh Yadav , Mamta Shukla , Daniel Vetter Subject: [PATCH 1/3] drm/msm/dpu: Fix error recovery after failing to enable clocks Date: Tue, 7 May 2019 13:18:09 -0600 Message-Id: <1557256691-25798-2-git-send-email-jcrouse@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1557256691-25798-1-git-send-email-jcrouse@codeaurora.org> References: <1557256691-25798-1-git-send-email-jcrouse@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If enabling clocks fails in msm_dss_enable_clk() the code to unwind the settings starts at 'i' which is the clock that just failed. While this isn't harmful it does result in a number of warnings from the clock subsystem while trying to unpreare/disable the very clock that had just failed to prepare/enable. Skip the current failed clock during the unwind to to avoid the extra log spew. Signed-off-by: Jordan Crouse --- drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c index 78833c2..a40a630 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c @@ -114,9 +114,9 @@ int msm_dss_enable_clk(struct dss_clk *clk_arry, int num_clk, int enable) rc = -EPERM; } - if (rc) { - msm_dss_enable_clk(&clk_arry[i], - i, false); + if (rc && i) { + msm_dss_enable_clk(&clk_arry[i - 1], + i - 1, false); break; } }