[PATCH] nv50: fix crash in NV50SyncToVBlank

[PATCH] nv50: fix crash in NV50SyncToVBlank

[Marcin Slusarz]

Regression from "WIP: port to new libdrm".
---
 src/nv50_accel.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/nv50_accel.c b/src/nv50_accel.c
index 66d6cb8..7c640f2 100644
--- a/src/nv50_accel.c
+++ b/src/nv50_accel.c
@@ -44,6 +44,9 @@ NV50SyncToVBlank(PixmapPtr ppix, BoxPtr box)
 	if (!crtcs)
 		return;
 
+	if (!PUSH_SPACE(push, 10))
+		return;
+
 	BEGIN_NV04(push, SUBC_NVSW(0x0060), 2);
 	PUSH_DATA (push, pNv->vblank_sem->handle);
 	PUSH_DATA (push, 0);
-- 
1.7.8.5

Re: [PATCH] nv50: fix crash in NV50SyncToVBlank

[Marcin Slusarz]

On Sun, Apr 15, 2012 at 01:46:42PM +0200, Marcin Slusarz wrote:
> Regression from "WIP: port to new libdrm".
> ---
>  src/nv50_accel.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/src/nv50_accel.c b/src/nv50_accel.c
> index 66d6cb8..7c640f2 100644
> --- a/src/nv50_accel.c
> +++ b/src/nv50_accel.c
> @@ -44,6 +44,9 @@ NV50SyncToVBlank(PixmapPtr ppix, BoxPtr box)
>  	if (!crtcs)
>  		return;
>  
> +	if (!PUSH_SPACE(push, 10))
> +		return;
> +
>  	BEGIN_NV04(push, SUBC_NVSW(0x0060), 2);
>  	PUSH_DATA (push, pNv->vblank_sem->handle);
>  	PUSH_DATA (push, 0);
> -- 

Nobody uses "sync to vblank"? It's crashy as hell without this patch...

Marcin

Re: [PATCH] nv50: fix crash in NV50SyncToVBlank

[Christoph Bumiller]

On 05/03/2012 03:08 PM, Marcin Slusarz wrote:
> On Sun, Apr 15, 2012 at 01:46:42PM +0200, Marcin Slusarz wrote:
>> Regression from "WIP: port to new libdrm".
>> ---
>>  src/nv50_accel.c |    3 +++
>>  1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/src/nv50_accel.c b/src/nv50_accel.c
>> index 66d6cb8..7c640f2 100644
>> --- a/src/nv50_accel.c
>> +++ b/src/nv50_accel.c
>> @@ -44,6 +44,9 @@ NV50SyncToVBlank(PixmapPtr ppix, BoxPtr box)
>>  	if (!crtcs)
>>  		return;
>>  
>> +	if (!PUSH_SPACE(push, 10))
>> +		return;
>> +
>>  	BEGIN_NV04(push, SUBC_NVSW(0x0060), 2);
>>  	PUSH_DATA (push, pNv->vblank_sem->handle);
>>  	PUSH_DATA (push, 0);
>> -- 
> 
> Nobody uses "sync to vblank"? It's crashy as hell without this patch...
> 

Apparently not ... I certainly never enable it because I couldn't find
the switch that doesn't require restarting the X server yet (granted, I
haven't looked besides noticing driconf doesn't do it).

Patch pushed, thank you.


> Marcin
> _______________________________________________
> Nouveau mailing list
> Nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
> http://lists.freedesktop.org/mailman/listinfo/nouveau