diff options
| author | Eric Anholt <eric@anholt.net> | 2017-03-01 13:56:01 -0500 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2017-03-02 12:57:10 -0500 |
| commit | eb981383ff74f109c72c8c94f4d63705d51cba20 (patch) | |
| tree | 63fa939c720d4d206f765964f66cd021315d618c | |
| parent | afc1ebf4562a14b8a981a0de2a3aa063dbd4c5b2 (diff) | |
drm/vc4: Fulfill user BO creation requests from the kernel BO cache.
The from_cache flag was actually "the BO is invisible to userspace",
so we can repurpose it to just zero out a cached BO and return it to
userspace.
Improves wall time for a loop of 5 glsl-algebraic-add-add-1 by
-1.44989% +/- 0.862891% (n=28, 1 outlier removed from each that
appeared to be other system noise)
Note that there's an intel-gpu-tools test to check for the proper
zeroing behavior here, which we continue to pass.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170301185602.6873-1-eric@anholt.net
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_bo.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c index 7abcd9c5dbe2..e5c7aa935b4b 100644 --- a/drivers/gpu/drm/vc4/vc4_bo.c +++ b/drivers/gpu/drm/vc4/vc4_bo.c | |||
| @@ -211,21 +211,22 @@ struct drm_gem_object *vc4_create_object(struct drm_device *dev, size_t size) | |||
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t unaligned_size, | 213 | struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t unaligned_size, |
| 214 | bool from_cache) | 214 | bool allow_unzeroed) |
| 215 | { | 215 | { |
| 216 | size_t size = roundup(unaligned_size, PAGE_SIZE); | 216 | size_t size = roundup(unaligned_size, PAGE_SIZE); |
| 217 | struct vc4_dev *vc4 = to_vc4_dev(dev); | 217 | struct vc4_dev *vc4 = to_vc4_dev(dev); |
| 218 | struct drm_gem_cma_object *cma_obj; | 218 | struct drm_gem_cma_object *cma_obj; |
| 219 | struct vc4_bo *bo; | ||
| 219 | 220 | ||
| 220 | if (size == 0) | 221 | if (size == 0) |
| 221 | return ERR_PTR(-EINVAL); | 222 | return ERR_PTR(-EINVAL); |
| 222 | 223 | ||
| 223 | /* First, try to get a vc4_bo from the kernel BO cache. */ | 224 | /* First, try to get a vc4_bo from the kernel BO cache. */ |
| 224 | if (from_cache) { | 225 | bo = vc4_bo_get_from_cache(dev, size); |
| 225 | struct vc4_bo *bo = vc4_bo_get_from_cache(dev, size); | 226 | if (bo) { |
| 226 | 227 | if (!allow_unzeroed) | |
| 227 | if (bo) | 228 | memset(bo->base.vaddr, 0, bo->base.base.size); |
| 228 | return bo; | 229 | return bo; |
| 229 | } | 230 | } |
| 230 | 231 | ||
| 231 | cma_obj = drm_gem_cma_create(dev, size); | 232 | cma_obj = drm_gem_cma_create(dev, size); |
