mirror of
https://github.com/torvalds/linux.git
synced 2024-10-28 07:41:44 +00:00
drm: allow multiple addMaps with the same 32-bit map offsset.
Reported on -mm kernels. Signed-off-by: Dave Airlie <airlied@linux.ie>
This commit is contained in:
parent
214ff13d9e
commit
e08870c87a
|
@ -77,14 +77,16 @@ static int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash,
|
||||||
#error Unsupported long size. Neither 64 nor 32 bits.
|
#error Unsupported long size. Neither 64 nor 32 bits.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (use_hashed_handle) {
|
if (!use_hashed_handle) {
|
||||||
return drm_ht_just_insert_please(&dev->map_hash, hash,
|
int ret;
|
||||||
user_token, 32 - PAGE_SHIFT - 3,
|
|
||||||
PAGE_SHIFT, DRM_MAP_HASH_OFFSET);
|
|
||||||
} else {
|
|
||||||
hash->key = user_token;
|
hash->key = user_token;
|
||||||
return drm_ht_insert_item(&dev->map_hash, hash);
|
ret = drm_ht_insert_item(&dev->map_hash, hash);
|
||||||
|
if (ret != -EINVAL)
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
return drm_ht_just_insert_please(&dev->map_hash, hash,
|
||||||
|
user_token, 32 - PAGE_SHIFT - 3,
|
||||||
|
PAGE_SHIFT, DRM_MAP_HASH_OFFSET);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue
Block a user