All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/nouveau: fix crash with noaccel=1
@ 2012-11-11 19:00 Marcin Slusarz
       [not found] ` <20121111190009.GD3530-OI9uyE9O0yo@public.gmane.org>
  0 siblings, 1 reply; 2+ messages in thread
From: Marcin Slusarz @ 2012-11-11 19:00 UTC (permalink / raw)
  To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Ortwin Glück


Reported-by: Ortwin Glück <odi@odi.ch>
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
---
 drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index cc79c79..cbf1fc6 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -241,6 +241,10 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
 
 	if (unlikely(!abi16))
 		return -ENOMEM;
+
+	if (!drm->channel)
+		return nouveau_abi16_put(abi16, -ENODEV);
+
 	client = nv_client(abi16->client);
 
 	if (init->fb_ctxdma_handle == ~0 || init->tt_ctxdma_handle == ~0)
-- 
1.7.12

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] drm/nouveau: fix crash with noaccel=1
       [not found] ` <20121111190009.GD3530-OI9uyE9O0yo@public.gmane.org>
@ 2012-11-12 18:12   ` Ortwin Glück
  0 siblings, 0 replies; 2+ messages in thread
From: Ortwin Glück @ 2012-11-12 18:12 UTC (permalink / raw)
  To: Marcin Slusarz; +Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

I am confirming that it fixes the problem.

Thanks!

Ortwin

On 11.11.2012 20:00, Marcin Slusarz wrote:
>
> Reported-by: Ortwin Glück <odi@odi.ch>
> Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
> ---
>   drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
> index cc79c79..cbf1fc6 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
> @@ -241,6 +241,10 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
>
>   	if (unlikely(!abi16))
>   		return -ENOMEM;
> +
> +	if (!drm->channel)
> +		return nouveau_abi16_put(abi16, -ENODEV);
> +
>   	client = nv_client(abi16->client);
>
>   	if (init->fb_ctxdma_handle == ~0 || init->tt_ctxdma_handle == ~0)
>
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-11-12 18:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-11 19:00 [PATCH] drm/nouveau: fix crash with noaccel=1 Marcin Slusarz
     [not found] ` <20121111190009.GD3530-OI9uyE9O0yo@public.gmane.org>
2012-11-12 18:12   ` Ortwin Glück

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.