From patchwork Fri Aug 12 21:09:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 9277961 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 08FF660231 for ; Fri, 12 Aug 2016 21:10:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E760C28A83 for ; Fri, 12 Aug 2016 21:10:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA7F528AF5; Fri, 12 Aug 2016 21:10:14 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6598E28A83 for ; Fri, 12 Aug 2016 21:10:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bYJiW-0007w7-T9; Fri, 12 Aug 2016 21:10:12 +0000 Received: from mail-qk0-x230.google.com ([2607:f8b0:400d:c09::230]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bYJiT-0007L8-T8 for linux-rockchip@lists.infradead.org; Fri, 12 Aug 2016 21:10:10 +0000 Received: by mail-qk0-x230.google.com with SMTP id f123so20962467qkd.1 for ; Fri, 12 Aug 2016 14:09:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=x2bKwpz5Lw2y8TGouF9JXJUsL30L4u05swalmz9hP2Y=; b=BNi5o9Pz17i/Zk+Do3K3LF2RujrPiasqJlOSNcV4f8HD+sDXSyfmezKe3aFO9dX2vd BBzLImWbw84bCNz9lXWxJY3K9zwd0ojys2Ek6c+wl33FSdXJd6C4myB+l1Eehhuvb/08 sI5cgY3P2IziBN8etARbG5to7NFFrzrZoG0YE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=x2bKwpz5Lw2y8TGouF9JXJUsL30L4u05swalmz9hP2Y=; b=lMdq4K3FPD8RCjP324+/GEYnOj+R5uRPiCR78YS4hf/h94ahXl5mJ4+c3NF8GAhFxv 3KThguRe5KRm7EB3CM5cPz0o+l+JuMaCKKMBzBPjfNVFeYk0uzDthFyjOJ7m4wEi+nNO I9D3Znzz98Psp2btHm9EBEhlL7TvOmJMfdBx9asoj1jTbnUmBa51rwfqPDGBfYlzbh6K bNkuHuKIicyhY/V+DU/sMNVB0Cok0eTdQMNnQjotBWp+rG9Wwlj/o+ujAyc0ZlcMXSOc wF03ur608bF23N3pBjRp/DwgsX/S37aPIyBHK1xpG4MwSJVnKxOg1Ln2GU2q3g7BjLif Cyug== X-Gm-Message-State: AEkoouvxViVUhi4CnwTbuwSJzGy1lk4byx1Y+GzXFQi73tGxj5GwDvjGBHMtLHioeSPNVRWV X-Received: by 10.55.170.1 with SMTP id t1mr20297613qke.42.1471036188255; Fri, 12 Aug 2016 14:09:48 -0700 (PDT) Received: from boxwood.roam.corp.google.com (cpe-75-189-128-87.nc.res.rr.com. [75.189.128.87]) by smtp.gmail.com with ESMTPSA id 1sm4150521qkj.42.2016.08.12.14.09.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Aug 2016 14:09:47 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org Subject: [PATCH] drm/rockchip: Don't continue trying to enable crtc on failure Date: Fri, 12 Aug 2016 17:09:41 -0400 Message-Id: <1471036181-14777-1-git-send-email-seanpaul@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160812_141010_071203_A74C33F2 X-CRM114-Status: GOOD ( 12.19 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sean Paul , mark.yao@rock-chips.com MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP If vop_enable fails, don't continue on, it causes system hangs. Signed-off-by: Sean Paul --- This patch uses the new DRM_DEV_ERROR logging, so it should be applied on top of "[PATCH 2/2] drm/rockchip: Use DRM_DEV_ERROR in vop". Sean drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index ec8ad00..d0ffe59 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -428,7 +428,7 @@ static void vop_dsp_hold_valid_irq_disable(struct vop *vop) spin_unlock_irqrestore(&vop->irq_lock, flags); } -static void vop_enable(struct drm_crtc *crtc) +static int vop_enable(struct drm_crtc *crtc) { struct vop *vop = to_vop(crtc); int ret; @@ -436,13 +436,13 @@ static void vop_enable(struct drm_crtc *crtc) ret = pm_runtime_get_sync(vop->dev); if (ret < 0) { dev_err(vop->dev, "failed to get pm runtime: %d\n", ret); - return; + goto err_put_pm_runtime; } ret = clk_enable(vop->hclk); if (ret < 0) { dev_err(vop->dev, "failed to enable hclk - %d\n", ret); - return; + goto err_put_pm_runtime; } ret = clk_enable(vop->dclk); @@ -485,7 +485,7 @@ static void vop_enable(struct drm_crtc *crtc) drm_crtc_vblank_on(crtc); - return; + return 0; err_disable_aclk: clk_disable(vop->aclk); @@ -493,6 +493,9 @@ err_disable_dclk: clk_disable(vop->dclk); err_disable_hclk: clk_disable(vop->hclk); +err_put_pm_runtime: + pm_runtime_put_sync(vop->dev); + return ret; } static void vop_crtc_disable(struct drm_crtc *crtc) @@ -912,10 +915,16 @@ static void vop_crtc_enable(struct drm_crtc *crtc) u16 vact_st = adjusted_mode->vtotal - adjusted_mode->vsync_start; u16 vact_end = vact_st + vdisplay; uint32_t val; + int ret; WARN_ON(vop->event); - vop_enable(crtc); + ret = vop_enable(crtc); + if (ret) { + DRM_DEV_ERROR(vop->dev, "Failed to enable vop (%d)\n", ret); + return; + } + /* * If dclk rate is zero, mean that scanout is stop, * we don't need wait any more.