[PATCH] drm/exynos: fix build error caused by removed drm core macros

[Inki Dae]

Hi Dave,

This patch fixes build error occurred by below two patches already
merged to drm-next,

commit bfd8303af0c46bd094289ee4e65f1e4bcc4fb7d3
Author: Daniel Vetter <daniel.vetter at ffwll.ch>
Date:   Wed Dec 11 11:34:41 2013 +0100

    drm: Kill DRM_HZ

    We don't have any userspace interfaces that use HZ as a time unit, so
    having our own DRM define is useless.

    Remove this remnant from the shared drm core days.

    Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
    Signed-off-by: Dave Airlie <airlied at redhat.com>


commit 57ed0f7b4375f4cb0ec3eccbc81f262294eefbcd
Author: Daniel Vetter <daniel.vetter at ffwll.ch>
Date:   Wed Dec 11 11:34:43 2013 +0100

    drm: Kill DRM_WAKUP and DRM_INIT_WAITQUEUE

    Less yelling ftw!

    Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
    Signed-off-by: Dave Airlie <airlied at redhat.com>


It seems that Daniel missed it. So could you merge this patch to
drm-next directly?

Thanks and Happy New Year!
Inki Dae


2013/12/30 Seung-Woo Kim <sw0312.kim at samsung.com>:
> DRM_HZ and DRM_WAKEUP macros are removed, but they still remained.
> So this patch fixes build errors by replacing the macros.
>
> Signed-off-by: Seung-Woo Kim <sw0312.kim at samsung.com>
> ---
> The build errors are only in drm-next branch, so this patch is based on the
> branch.
> ---
>  drivers/gpu/drm/exynos/exynos_drm_fimd.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> index 267aca9..a20440c 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> @@ -347,7 +347,7 @@ static void fimd_wait_for_vblank(struct device *dev)
>          */
>         if (!wait_event_timeout(ctx->wait_vsync_queue,
>                                 !atomic_read(&ctx->wait_vsync_event),
> -                               DRM_HZ/20))
> +                               HZ/20))
>                 DRM_DEBUG_KMS("vblank wait timed out.\n");
>  }
>
> @@ -706,7 +706,7 @@ static irqreturn_t fimd_irq_handler(int irq, void *dev_id)
>         /* set wait vsync event to zero and wake up queue. */
>         if (atomic_read(&ctx->wait_vsync_event)) {
>                 atomic_set(&ctx->wait_vsync_event, 0);
> -               DRM_WAKEUP(&ctx->wait_vsync_queue);
> +               wake_up(&ctx->wait_vsync_queue);
>         }
>  out:
>         return IRQ_HANDLED;
> --
> 1.7.4.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel