From a66b4b5e03a863bda9782866cf1316dc4a89b066 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 24 Nov 2010 10:07:21 +1000 Subject: [PATCH] --- yaml --- r: 228627 b: refs/heads/master c: 587107b690f567690982fb504047e7b0a6590344 h: refs/heads/master i: 228625: aec9fb93b77fc30f3aa8fef925eaf0aa7d9ec8fb 228623: 239f335edc32381eb5f1b2d4c028ed04a77c3ea1 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_notifier.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1d34fd31eb63..d4879bb93192 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99805566d93d69b7daf2373aba9fae52a62396f4 +refs/heads/master: 587107b690f567690982fb504047e7b0a6590344 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_notifier.c b/trunk/drivers/gpu/drm/nouveau/nouveau_notifier.c index a050b7b69782..fe29d604b820 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_notifier.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_notifier.c @@ -164,10 +164,15 @@ int nouveau_ioctl_notifier_alloc(struct drm_device *dev, void *data, struct drm_file *file_priv) { + struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_notifierobj_alloc *na = data; struct nouveau_channel *chan; int ret; + /* completely unnecessary for these chipsets... */ + if (unlikely(dev_priv->card_type >= NV_C0)) + return -EINVAL; + chan = nouveau_channel_get(dev, file_priv, na->channel); if (IS_ERR(chan)) return PTR_ERR(chan);