diff options
| author | Dave Airlie | 2014-09-05 01:27:33 +0200 |
|---|---|---|
| committer | Dave Airlie | 2014-09-05 01:27:33 +0200 |
| commit | 68c78bd67bd6f868474ac75d98ea7d6ebf28d2e7 (patch) | |
| tree | 5fa9718da2caa58042e2d3efa4c018db5c63d38c /drivers/gpu/drm | |
| parent | Merge tag 'drm-intel-fixes-2014-09-03' of git://anongit.freedesktop.org/drm-i... (diff) | |
| parent | drm/nouveau/core: don't leak oclass type bits to user (diff) | |
| download | kernel-qcow2-linux-68c78bd67bd6f868474ac75d98ea7d6ebf28d2e7.tar.gz kernel-qcow2-linux-68c78bd67bd6f868474ac75d98ea7d6ebf28d2e7.tar.xz kernel-qcow2-linux-68c78bd67bd6f868474ac75d98ea7d6ebf28d2e7.zip | |
Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
single fix for nouveau.
* 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/core: don't leak oclass type bits to user
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/core/parent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/core/parent.c b/drivers/gpu/drm/nouveau/core/core/parent.c index 8701968a9743..30a2911878f8 100644 --- a/drivers/gpu/drm/nouveau/core/core/parent.c +++ b/drivers/gpu/drm/nouveau/core/core/parent.c @@ -86,7 +86,7 @@ nouveau_parent_lclass(struct nouveau_object *parent, u32 *lclass, int size) sclass = nv_parent(parent)->sclass; while (sclass) { if (++nr < size) - lclass[nr] = sclass->oclass->handle; + lclass[nr] = sclass->oclass->handle & 0xffff; sclass = sclass->sclass; } @@ -96,7 +96,7 @@ nouveau_parent_lclass(struct nouveau_object *parent, u32 *lclass, int size) if (engine && (oclass = engine->sclass)) { while (oclass->ofuncs) { if (++nr < size) - lclass[nr] = oclass->handle; + lclass[nr] = oclass->handle & 0xffff; oclass++; } } |