diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2016-02-24 09:04:41 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2016-04-14 13:54:24 +0100 |
| commit | 89b3ffe02c2a308c4663b6781ac1302c221932c2 (patch) | |
| tree | 02412dc8c7cb22c0d65330b9b7ab278d52889cf7 | |
| parent | a2d5b348ee0f9b51ef3b38393ce91ddbefbfaacb (diff) | |
lib: Map dumb buffers
If a buffer object is dumb, call DRM_IOCTL_MODE_MAP_DUMB when mapping
it. Also, don't call DRM_IOCTL_I915_GEM_SET_DOMAIN on dumb buffers.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | lib/igt_fb.c | 17 | ||||
| -rw-r--r-- | lib/igt_fb.h | 1 |
2 files changed, 16 insertions, 2 deletions
diff --git a/lib/igt_fb.c b/lib/igt_fb.c index ee03d622f07d..50bb192f3099 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -582,6 +582,7 @@ igt_create_fb_with_bo_size(int fd, int width, int height, fb->tiling = tiling; fb->drm_format = format; fb->fb_id = fb_id; + fb->fd = fd; return fb_id; } @@ -1034,11 +1035,21 @@ static void destroy_cairo_surface__gtt(void *arg) munmap(cairo_image_surface_get_data(fb->cairo_surface), fb->size); fb->cairo_surface = NULL; + + if (fb->is_dumb) + igt_dirty_fb(fb->fd, fb); } static void create_cairo_surface__gtt(int fd, struct igt_fb *fb) { - void *ptr = gem_mmap__gtt(fd, fb->gem_handle, fb->size, PROT_READ | PROT_WRITE); + void *ptr; + + if (fb->is_dumb) + ptr = kmstest_dumb_map_buffer(fd, fb->gem_handle, fb->size, + PROT_READ | PROT_WRITE); + else + ptr = gem_mmap__gtt(fd, fb->gem_handle, fb->size, + PROT_READ | PROT_WRITE); fb->cairo_surface = cairo_image_surface_create_for_data(ptr, @@ -1061,7 +1072,9 @@ static cairo_surface_t *get_cairo_surface(int fd, struct igt_fb *fb) create_cairo_surface__gtt(fd, fb); } - gem_set_domain(fd, fb->gem_handle, fb->domain, fb->domain); + if (!fb->is_dumb) + gem_set_domain(fd, fb->gem_handle, I915_GEM_DOMAIN_CPU, + I915_GEM_DOMAIN_CPU); igt_assert(cairo_surface_status(fb->cairo_surface) == CAIRO_STATUS_SUCCESS); return fb->cairo_surface; diff --git a/lib/igt_fb.h b/lib/igt_fb.h index 03bc9880a0cd..c314aad046fc 100644 --- a/lib/igt_fb.h +++ b/lib/igt_fb.h @@ -46,6 +46,7 @@ typedef struct _cairo cairo_t; /* helpers to create nice-looking framebuffers */ struct igt_fb { uint32_t fb_id; + int fd; uint32_t gem_handle; uint32_t drm_format; int width; |