[i-g-t,v2,10/17] lib: Map dumb buffers

Commit Message

Tomeu Vizoso March 8, 2016, 2:51 p.m. UTC

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 <[e-mail]>
---

Changes in v2:
- Call dirtyfb after the cairo context associated to a FB backed by a
  dumb buffer is destroyed. For this, I need to store the fd that was
  used when the FB was created.
- Call kmstest_dumb_map_buffer instead of open coding it.

 lib/igt_fb.c | 17 +++++++++++++++--
 lib/igt_fb.h |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

Patch

diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 9d6cff0edd23..361f94627659 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -547,6 +547,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;
 }
@@ -999,11 +1000,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,
@@ -1026,7 +1037,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 ec88854ddeb7..91e91408b340 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;