| Message ID | 1389103152-21877-2-git-send-email-broonie@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, 2014/1/8 Daniel Vetter <daniel@ffwll.ch>: > On Tue, Jan 07, 2014 at 01:59:12PM +0000, Mark Brown wrote: >> From: Mark Brown <broonie@linaro.org> >> >> Commit 57ed0f7b4375 (drm: Kill DRM_WAKUP and DRM_INIT_WAITQUEUE) removed >> the definition of DRM_WAKUP but did not remove the use of it in the Exynos >> DRM driver causing it to fail to build. Fix that. >> >> Signed-off-by: Mark Brown <broonie@linaro.org> > > Oops, looks like something slipped past between me making the patches and > them getting merged. Thanks for taking care of this. Both patches are > These patches already were posted by Seung-Woo link below, and I merged already them to exynos-drm-next. http://www.spinics.net/lists/dri-devel/msg50921.html Thanks, Inki Dae > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> >> --- >> drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c >> index bdfe31fb731b..05b72b07a134 100644 >> --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c >> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c >> @@ -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.8.5.2 >> > > -- > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
On Wed, Jan 08, 2014 at 10:15:25AM +0900, Inki Dae wrote: > 2014/1/8 Daniel Vetter <daniel@ffwll.ch>: > > Oops, looks like something slipped past between me making the patches and > > them getting merged. Thanks for taking care of this. Both patches are > These patches already were posted by Seung-Woo link below, and I > merged already them to exynos-drm-next. > http://www.spinics.net/lists/dri-devel/msg50921.html Are you sure? I still need those patches in -next as of today.
Hello, On 2014? 01? 08? 21:03, Mark Brown wrote: > On Wed, Jan 08, 2014 at 10:15:25AM +0900, Inki Dae wrote: >> 2014/1/8 Daniel Vetter <daniel@ffwll.ch>: > >>> Oops, looks like something slipped past between me making the patches and >>> them getting merged. Thanks for taking care of this. Both patches are > >> These patches already were posted by Seung-Woo link below, and I >> merged already them to exynos-drm-next. >> http://www.spinics.net/lists/dri-devel/msg50921.html > > Are you sure? I still need those patches in -next as of today. > Yes, at least for exynos-drm-next tree of Inki. Inki sent pull request including my patch yesterday. Best Regards, - Seung-Woo Kim
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index bdfe31fb731b..05b72b07a134 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -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;