projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arm-soc/for-3.18/cygnus-dts-v9' of http://github.com/brcm/linux into next/dt
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_ring.c
diff --git
a/drivers/gpu/drm/radeon/radeon_ring.c
b/drivers/gpu/drm/radeon/radeon_ring.c
index
3d17af3
..
2456f69
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_ring.c
+++ b/
drivers/gpu/drm/radeon/radeon_ring.c
@@
-314,7
+314,7
@@
unsigned radeon_ring_backup(struct radeon_device *rdev, struct radeon_ring *ring
}
/* and then save the content of the ring */
}
/* and then save the content of the ring */
- *data =
kmalloc_array(size, sizeof(uint32_t), GFP_KERNEL
);
+ *data =
drm_malloc_ab(size, sizeof(uint32_t)
);
if (!*data) {
mutex_unlock(&rdev->ring_lock);
return 0;
if (!*data) {
mutex_unlock(&rdev->ring_lock);
return 0;
@@
-356,7
+356,7
@@
int radeon_ring_restore(struct radeon_device *rdev, struct radeon_ring *ring,
}
radeon_ring_unlock_commit(rdev, ring, false);
}
radeon_ring_unlock_commit(rdev, ring, false);
-
kfre
e(data);
+
drm_free_larg
e(data);
return 0;
}
return 0;
}