[PATCH 1/9] drm/exynos: add error messages if clks failed to get enabled

[Alexey Klimov]

On Wed, Jun 3, 2015 at 7:59 PM, Alexey Klimov <klimov.linux at gmail.com> wrote:
> Hi Gustavo,
>
> On Wed, Jun 3, 2015 at 5:30 PM, Gustavo Padovan <gustavo at padovan.org> wrote:
>> From: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
>>
>> Check error and call DRM_ERROR if clk_prepare_enable() fails.
>>
>> Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
>> ---
>>  drivers/gpu/drm/exynos/exynos7_drm_decon.c | 29 ++++++++++++++++++++++++----
>>  drivers/gpu/drm/exynos/exynos_drm_fimd.c   | 14 ++++++++++++--
>>  drivers/gpu/drm/exynos/exynos_mixer.c      | 31 +++++++++++++++++++++++++-----
>>  3 files changed, 63 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..ffd7c3b 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,30 @@ 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;
>> +               goto pclk_err;
>
> This goto after return probably got here by mistake. Debug/rebase leftover?
>
>
> <..snip..>
>
>
> By the way, are you using some branch to prepare this patch?
> Could you please check if you're able to apple it?
> In current master branch that i see similar DRM_ERROR() messages are
> already in place in similar functions. For example, in master branch i
> see decon_poweron() instead of decon_enable() and fimd_poweron()
> instead of fimd_enable() in your patch. Is there any chance that it's
> slightly outdated?

Ah, now i see. It depends on "[PATCH v10 17/17] drm/exynos: split
exynos_crtc->dpms in enable() and disable()" and partially reverts it
and restores messages back.

-- 
Best regards,
Alexey Klimov