mirror of
https://github.com/torvalds/linux.git
synced 2024-12-19 17:41:29 +00:00
drm/etnaviv: clean up etnaviv_gem_new_handle
Setting the GFP flags does not need a new code block if moved to the right location, which makes this function a bit easier to read. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
This commit is contained in:
parent
1262cc8893
commit
fd2450a77d
@ -628,24 +628,18 @@ int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file,
|
||||
lockdep_set_class(&to_etnaviv_bo(obj)->lock, &etnaviv_shm_lock_class);
|
||||
|
||||
ret = drm_gem_object_init(dev, obj, size);
|
||||
if (ret == 0) {
|
||||
struct address_space *mapping;
|
||||
|
||||
/*
|
||||
* Our buffers are kept pinned, so allocating them
|
||||
* from the MOVABLE zone is a really bad idea, and
|
||||
* conflicts with CMA. See comments above new_inode()
|
||||
* why this is required _and_ expected if you're
|
||||
* going to pin these pages.
|
||||
*/
|
||||
mapping = obj->filp->f_mapping;
|
||||
mapping_set_gfp_mask(mapping, GFP_HIGHUSER |
|
||||
__GFP_RETRY_MAYFAIL | __GFP_NOWARN);
|
||||
}
|
||||
|
||||
if (ret)
|
||||
goto fail;
|
||||
|
||||
/*
|
||||
* Our buffers are kept pinned, so allocating them from the MOVABLE
|
||||
* zone is a really bad idea, and conflicts with CMA. See comments
|
||||
* above new_inode() why this is required _and_ expected if you're
|
||||
* going to pin these pages.
|
||||
*/
|
||||
mapping_set_gfp_mask(obj->filp->f_mapping, GFP_HIGHUSER |
|
||||
__GFP_RETRY_MAYFAIL | __GFP_NOWARN);
|
||||
|
||||
etnaviv_gem_obj_add(dev, obj);
|
||||
|
||||
ret = drm_gem_handle_create(file, obj, handle);
|
||||
|
Loading…
Reference in New Issue
Block a user