Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1671588 > unrolled thread

[PATCH] drm: sti: sti_hqvdp: undo preparation of a clock source.

Back to article view | Back to linux.kernel

Contents

  [PATCH] drm: sti: sti_hqvdp: undo preparation of a clock source. Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-06-21 12:20 +0200
    Re: [PATCH] drm: sti: sti_hqvdp: undo preparation of a clock source. Benjamin Gaignard <benjamin.gaignard@linaro.org> - 2017-06-21 16:00 +0200

#1671588 — [PATCH] drm: sti: sti_hqvdp: undo preparation of a clock source.

Undo preparation of a clock source, if sti_hqvdp_start_xp70 and
sti_hqvdp_atomic_check are not successful.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
 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

[toc] | [next] | [standalone]

#1671689

2017-06-21 12:15 GMT+02:00 Arvind Yadav <arvind.yadav.cs@gmail.com>:
> Undo preparation of a clock source, if sti_hqvdp_start_xp70 and
> sti_hqvdp_atomic_check are not successful.
>
> Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web