diff options
| author | Ilia Mirkin | 2014-02-09 21:51:25 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2014-03-26 04:59:32 +0100 |
| commit | ef98c1f7b37116ae45d892a23f46cffdda31773c (patch) | |
| tree | e877c8ae7961bc9fed5f35ad7549cff004d0edc3 /drivers/gpu/drm/nouveau/nouveau_abi16.c | |
| parent | drm/nouveau: replace ffsll with __ffs64 (diff) | |
| download | kernel-qcow2-linux-ef98c1f7b37116ae45d892a23f46cffdda31773c.tar.gz kernel-qcow2-linux-ef98c1f7b37116ae45d892a23f46cffdda31773c.tar.xz kernel-qcow2-linux-ef98c1f7b37116ae45d892a23f46cffdda31773c.zip | |
drm/nouveau/abi16: fix handles past the 32nd one
abi16->handles is a u64, so make sure to use 1ULL << val when modifying.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_abi16.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c index b70111711be3..66abf4d6e575 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c @@ -139,7 +139,7 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16, /* destroy channel object, all children will be killed too */ if (chan->chan) { - abi16->handles &= ~(1 << (chan->chan->handle & 0xffff)); + abi16->handles &= ~(1ULL << (chan->chan->handle & 0xffff)); nouveau_channel_del(&chan->chan); } @@ -280,7 +280,7 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) INIT_LIST_HEAD(&chan->notifiers); list_add(&chan->head, &abi16->channels); - abi16->handles |= (1 << init->channel); + abi16->handles |= (1ULL << init->channel); /* create channel object and initialise dma and fence management */ ret = nouveau_channel_new(drm, cli, NVDRM_DEVICE, NVDRM_CHAN | |