On 2015ë
06ì 04ì¼ 05:17, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
>
> Check error and call DRM_ERROR if clk_prepare_enable() fails.
Applied.
Thanks,
Inki Dae
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
> ---
> drivers/gpu/drm/exynos/exynos7_drm_decon.c | 28 +++++++++++++++++++++++----
> drivers/gpu/drm/exynos/exynos_drm_fimd.c | 14 ++++++++++++--
> drivers/gpu/drm/exynos/exynos_mixer.c | 31
> +++++++++++++++++++++++++-----
> 3 files changed, 62 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
> b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
> index d659ba2..d9798e2 100644
> --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
> +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
> @@ -606,6 +606,7 @@ static void decon_init(struct decon_context *ctx)
> static void decon_enable(struct exynos_drm_crtc *crtc)
> {
> struct decon_context *ctx = crtc->ctx;
> + int ret;
>
> if (!ctx->suspended)
> return;
> @@ -614,10 +615,29 @@ static void decon_enable(struct exynos_drm_crtc *crtc)
>
> pm_runtime_get_sync(ctx->dev);
>
> - clk_prepare_enable(ctx->pclk);
> - clk_prepare_enable(ctx->aclk);
> - clk_prepare_enable(ctx->eclk);
> - clk_prepare_enable(ctx->vclk);
> + ret = clk_prepare_enable(ctx->pclk);
> + if (ret < 0) {
> + DRM_ERROR("Failed to prepare_enable the pclk [%d]\n", ret);
> + return;
> + }
> +
> + ret = clk_prepare_enable(ctx->aclk);
> + if (ret < 0) {
> + DRM_ERROR("Failed to prepare_enable the aclk [%d]\n", ret);
> + return;
> + }
> +
> + ret = clk_prepare_enable(ctx->eclk);
> + if (ret < 0) {
> + DRM_ERROR("Failed to prepare_enable the eclk [%d]\n", ret);
> + return;
> + }
> +
> + ret = clk_prepare_enable(ctx->vclk);
> + if (ret < 0) {
> + DRM_ERROR("Failed to prepare_enable the vclk [%d]\n", ret);
> + return;
> + }
>
> decon_init(ctx);
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> index 9661853..7c8ba61 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> @@ -808,6 +808,7 @@ static void fimd_apply(struct fimd_context *ctx)
> static void fimd_enable(struct exynos_drm_crtc *crtc)
> {
> struct fimd_context *ctx = crtc->ctx;
> + int ret;
>
> if (!ctx->suspended)
> return;
> @@ -816,8 +817,17 @@ static void fimd_enable(struct exynos_drm_crtc *crtc)
>
> pm_runtime_get_sync(ctx->dev);
>
> - clk_prepare_enable(ctx->bus_clk);
> - clk_prepare_enable(ctx->lcd_clk);
> + ret = clk_prepare_enable(ctx->bus_clk);
> + if (ret < 0) {
> + DRM_ERROR("Failed to prepare_enable the bus clk [%d]\n", ret);
> + return;
> + }
> +
> + ret = clk_prepare_enable(ctx->lcd_clk);
> + if (ret < 0) {
> + DRM_ERROR("Failed to prepare_enable the lcd clk [%d]\n", ret);
> + return;
> + }
>
> /* if vblank was enabled status, enable it again. */
> if (test_and_clear_bit(0, &ctx->irq_flags))
> diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c
> b/drivers/gpu/drm/exynos/exynos_mixer.c
> index 6bab717..1b77fc7 100644
> --- a/drivers/gpu/drm/exynos/exynos_mixer.c
> +++ b/drivers/gpu/drm/exynos/exynos_mixer.c
> @@ -1031,6 +1031,7 @@ static void mixer_enable(struct exynos_drm_crtc *crtc)
> {
> struct mixer_context *ctx = crtc->ctx;
> struct mixer_resources *res = &ctx->mixer_res;
> + int ret;
>
> mutex_lock(&ctx->mixer_mutex);
> if (ctx->powered) {
> @@ -1042,12 +1043,32 @@ static void mixer_enable(struct exynos_drm_crtc *crtc)
>
> pm_runtime_get_sync(ctx->dev);
>
> - clk_prepare_enable(res->mixer);
> - clk_prepare_enable(res->hdmi);
> + ret = clk_prepare_enable(res->mixer);
> + if (ret < 0) {
> + DRM_ERROR("Failed to prepare_enable the mixer clk [%d]\n", ret);
> + return;
> + }
> + ret = clk_prepare_enable(res->hdmi);
> + if (ret < 0) {
> + DRM_ERROR("Failed to prepare_enable the hdmi clk [%d]\n", ret);
> + return;
> + }
> if (ctx->vp_enabled) {
> - clk_prepare_enable(res->vp);
> - if (ctx->has_sclk)
> - clk_prepare_enable(res->sclk_mixer);
> + ret = clk_prepare_enable(res->vp);
> + if (ret < 0) {
> + DRM_ERROR("Failed to prepare_enable the vp clk [%d]\n",
> + ret);
> + return;
> + }
> + if (ctx->has_sclk) {
> + ret = clk_prepare_enable(res->sclk_mixer);
> + if (ret < 0) {
> + DRM_ERROR("Failed to prepare_enable the " \
> + "sclk_mixer clk [%d]\n",
> + ret);
> + return;
> + }
> + }
> }
>
> mutex_lock(&ctx->mixer_mutex);
>
