flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-25 16:56:35 +00:00
Code Issues Releases Wiki Activity

lib: Map dumb buffers

Browse Source 
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>
This commit is contained in:
Tomeu Vizoso 2016-02-24 09:04:41 +01:00 committed by Daniel Stone
parent a2d5b348ee
commit 89b3ffe02c
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/igt_fb.c
View File

@ -582,6 +582,7 @@ igt_create_fb_with_bo_size(int fd, int width, int height,
fb->tiling = tiling; fb->tiling = tiling;
fb->drm_format = format; fb->drm_format = format;
fb->fb_id = fb_id; fb->fb_id = fb_id;
fb->fd = fd;
return fb_id; 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); munmap(cairo_image_surface_get_data(fb->cairo_surface), fb->size);
fb->cairo_surface = NULL; 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) 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 = fb->cairo_surface =
cairo_image_surface_create_for_data(ptr, 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); 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); igt_assert(cairo_surface_status(fb->cairo_surface) == CAIRO_STATUS_SUCCESS);
return fb->cairo_surface; return fb->cairo_surface;

1
lib/igt_fb.h
View File

@ -46,6 +46,7 @@ typedef struct _cairo cairo_t;
/* helpers to create nice-looking framebuffers */ /* helpers to create nice-looking framebuffers */
struct igt_fb { struct igt_fb {
uint32_t fb_id; uint32_t fb_id;
int fd;
uint32_t gem_handle; uint32_t gem_handle;
uint32_t drm_format; uint32_t drm_format;
int width; int width;