diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-11 05:34:43 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-17 20:34:13 -0500 |
| commit | 57ed0f7b4375f4cb0ec3eccbc81f262294eefbcd (patch) | |
| tree | 935ea0949b91080532de66d1d74f8a97a4c81223 /drivers/gpu/drm/exynos | |
| parent | e9f0d76f3bcd4dda7136baaaaf45bda3b13ff40f (diff) | |
drm: Kill DRM_WAKUP and DRM_INIT_WAITQUEUE
Less yelling ftw!
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/exynos')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index a61878bf5dcd..267aca91b70d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c | |||
| @@ -954,7 +954,7 @@ static int fimd_probe(struct platform_device *pdev) | |||
| 954 | } | 954 | } |
| 955 | 955 | ||
| 956 | ctx->driver_data = drm_fimd_get_driver_data(pdev); | 956 | ctx->driver_data = drm_fimd_get_driver_data(pdev); |
| 957 | DRM_INIT_WAITQUEUE(&ctx->wait_vsync_queue); | 957 | init_waitqueue_head(&ctx->wait_vsync_queue); |
| 958 | atomic_set(&ctx->wait_vsync_event, 0); | 958 | atomic_set(&ctx->wait_vsync_event, 0); |
| 959 | 959 | ||
| 960 | subdrv = &ctx->subdrv; | 960 | subdrv = &ctx->subdrv; |
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 1433300565e5..2dfa48c76f54 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c | |||
| @@ -1019,7 +1019,7 @@ static irqreturn_t mixer_irq_handler(int irq, void *arg) | |||
| 1019 | /* set wait vsync event to zero and wake up queue. */ | 1019 | /* set wait vsync event to zero and wake up queue. */ |
| 1020 | if (atomic_read(&ctx->wait_vsync_event)) { | 1020 | if (atomic_read(&ctx->wait_vsync_event)) { |
| 1021 | atomic_set(&ctx->wait_vsync_event, 0); | 1021 | atomic_set(&ctx->wait_vsync_event, 0); |
| 1022 | DRM_WAKEUP(&ctx->wait_vsync_queue); | 1022 | wake_up(&ctx->wait_vsync_queue); |
| 1023 | } | 1023 | } |
| 1024 | } | 1024 | } |
| 1025 | 1025 | ||
| @@ -1209,7 +1209,7 @@ static int mixer_probe(struct platform_device *pdev) | |||
| 1209 | drm_hdmi_ctx->ctx = (void *)ctx; | 1209 | drm_hdmi_ctx->ctx = (void *)ctx; |
| 1210 | ctx->vp_enabled = drv->is_vp_enabled; | 1210 | ctx->vp_enabled = drv->is_vp_enabled; |
| 1211 | ctx->mxr_ver = drv->version; | 1211 | ctx->mxr_ver = drv->version; |
| 1212 | DRM_INIT_WAITQUEUE(&ctx->wait_vsync_queue); | 1212 | init_waitqueue_head(&ctx->wait_vsync_queue); |
| 1213 | atomic_set(&ctx->wait_vsync_event, 0); | 1213 | atomic_set(&ctx->wait_vsync_event, 0); |
| 1214 | 1214 | ||
| 1215 | platform_set_drvdata(pdev, drm_hdmi_ctx); | 1215 | platform_set_drvdata(pdev, drm_hdmi_ctx); |
