Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752192AbdFUNzJ (ORCPT ); Wed, 21 Jun 2017 09:55:09 -0400 Received: from mail-qt0-f169.google.com ([209.85.216.169]:34854 "EHLO mail-qt0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751152AbdFUNzH (ORCPT ); Wed, 21 Jun 2017 09:55:07 -0400 MIME-Version: 1.0 In-Reply-To: <7afad3012fb6e40f43a1eb5a64dc6364c38bd052.1498039961.git.arvind.yadav.cs@gmail.com> References: <7afad3012fb6e40f43a1eb5a64dc6364c38bd052.1498039961.git.arvind.yadav.cs@gmail.com> From: Benjamin Gaignard Date: Wed, 21 Jun 2017 15:55:06 +0200 Message-ID: Subject: Re: [PATCH] drm: sti: sti_hqvdp: undo preparation of a clock source. To: Arvind Yadav Cc: Vincent Abriou , David Airlie , "dri-devel@lists.freedesktop.org" , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1584 Lines: 44 2017-06-21 12:15 GMT+02:00 Arvind Yadav : > Undo preparation of a clock source, if sti_hqvdp_start_xp70 and > sti_hqvdp_atomic_check are not successful. > > Signed-off-by: Arvind Yadav Applied on drm-misc-next, thanks, Benjamin > --- > drivers/gpu/drm/sti/sti_hqvdp.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c > index 075802d..8dbb34d 100644 > --- a/drivers/gpu/drm/sti/sti_hqvdp.c > +++ b/drivers/gpu/drm/sti/sti_hqvdp.c > @@ -959,6 +959,7 @@ static void sti_hqvdp_start_xp70(struct sti_hqvdp *hqvdp) > } > if (i == POLL_MAX_ATTEMPT) { > DRM_ERROR("Could not reset\n"); > + clk_disable_unprepare(hqvdp->clk); > goto out; > } > > @@ -995,6 +996,7 @@ static void sti_hqvdp_start_xp70(struct sti_hqvdp *hqvdp) > } > if (i == POLL_MAX_ATTEMPT) { > DRM_ERROR("Could not boot\n"); > + clk_disable_unprepare(hqvdp->clk); > goto out; > } > > @@ -1082,6 +1084,7 @@ static int sti_hqvdp_atomic_check(struct drm_plane *drm_plane, > &hqvdp->vtg_nb, > crtc)) { > DRM_ERROR("Cannot register VTG notifier\n"); > + clk_disable_unprepare(hqvdp->clk_pix_main); > return -EINVAL; > } > hqvdp->vtg_registered = true; > -- > 1.9.1