All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/exynos: Fix build after removal of DRM_HZ
@ 2014-01-07 13:59 Mark Brown
  2014-01-07 13:59 ` [PATCH 2/2] drm/exynos: Fix build after removal of DRM_WAKUP Mark Brown
  0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2014-01-07 13:59 UTC (permalink / raw)
  To: Daniel Vetter, Inki Dae, Joonyoung Shim, Seung-Woo Kim,
	Kyungmin Park, David Airlie
  Cc: linux-samsung-soc, dri-devel, linaro-kernel, Mark Brown

From: Mark Brown <broonie@linaro.org>

Commit bfd8303af0c46 (drm: Kill DRM_HZ) removed the definition of DRM_HZ
but did not remove its use in the Exynos DRM driver causing it to fail to
build. Fix that.

Signed-off-by: Mark Brown <broonie@linaro.org>
---
 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 267aca91b70d..bdfe31fb731b 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");
 }
 
-- 
1.8.5.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 2/2] drm/exynos: Fix build after removal of DRM_WAKUP
  2014-01-07 13:59 [PATCH 1/2] drm/exynos: Fix build after removal of DRM_HZ Mark Brown
@ 2014-01-07 13:59 ` Mark Brown
  2014-01-07 16:14   ` Daniel Vetter
  0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2014-01-07 13:59 UTC (permalink / raw)
  To: Daniel Vetter, Inki Dae, Joonyoung Shim, Seung-Woo Kim,
	Kyungmin Park, David Airlie
  Cc: linux-samsung-soc, dri-devel, linaro-kernel, Mark Brown

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>
---
 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

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/exynos: Fix build after removal of DRM_WAKUP
  2014-01-07 13:59 ` [PATCH 2/2] drm/exynos: Fix build after removal of DRM_WAKUP Mark Brown
@ 2014-01-07 16:14   ` Daniel Vetter
  2014-01-08  1:15     ` Inki Dae
  0 siblings, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2014-01-07 16:14 UTC (permalink / raw)
  To: Mark Brown
  Cc: Daniel Vetter, Inki Dae, Joonyoung Shim, Seung-Woo Kim,
	Kyungmin Park, David Airlie, linux-samsung-soc, dri-devel,
	linaro-kernel, Mark Brown

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

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/exynos: Fix build after removal of DRM_WAKUP
  2014-01-07 16:14   ` Daniel Vetter
@ 2014-01-08  1:15     ` Inki Dae
  2014-01-08 12:03       ` Mark Brown
  0 siblings, 1 reply; 6+ messages in thread
From: Inki Dae @ 2014-01-08  1:15 UTC (permalink / raw)
  To: Daniel Vetter
  Cc: Mark Brown, linux-samsung-soc@vger.kernel.org, Mark Brown,
	Daniel Vetter, Seung-Woo Kim, DRI mailing list, Kyungmin Park,
	linaro-kernel

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/exynos: Fix build after removal of DRM_WAKUP
  2014-01-08  1:15     ` Inki Dae
@ 2014-01-08 12:03       ` Mark Brown
  2014-01-08 12:15         ` Seung-Woo Kim
  0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2014-01-08 12:03 UTC (permalink / raw)
  To: Inki Dae
  Cc: Daniel Vetter, linux-samsung-soc@vger.kernel.org, Daniel Vetter,
	Seung-Woo Kim, DRI mailing list, Kyungmin Park, linaro-kernel

[-- Attachment #1: Type: text/plain, Size: 489 bytes --]

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.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/exynos: Fix build after removal of DRM_WAKUP
  2014-01-08 12:03       ` Mark Brown
@ 2014-01-08 12:15         ` Seung-Woo Kim
  0 siblings, 0 replies; 6+ messages in thread
From: Seung-Woo Kim @ 2014-01-08 12:15 UTC (permalink / raw)
  To: Mark Brown
  Cc: linux-samsung-soc@vger.kernel.org, Daniel Vetter, Seung-Woo Kim,
	DRI mailing list, Kyungmin Park, linaro-kernel

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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-01-08 12:15 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-07 13:59 [PATCH 1/2] drm/exynos: Fix build after removal of DRM_HZ Mark Brown
2014-01-07 13:59 ` [PATCH 2/2] drm/exynos: Fix build after removal of DRM_WAKUP Mark Brown
2014-01-07 16:14   ` Daniel Vetter
2014-01-08  1:15     ` Inki Dae
2014-01-08 12:03       ` Mark Brown
2014-01-08 12:15         ` Seung-Woo Kim

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.