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

testdisplay: Map the fb inside paint_color_key()

Browse Source 
So the code for this is self-contained. This goes along the way of
reducing the number of global variables in testdisplay.

Take the opportunity to unmap the fb after use as well.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau 2013-09-04 12:12:37 +01:00
parent 0396273972
commit 5a1d84300b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/testdisplay.c
View File

@ -82,7 +82,6 @@ unsigned int plane_crtc_id;
unsigned int plane_id; unsigned int plane_id;
int plane_width, plane_height; int plane_width, plane_height;
static const uint32_t SPRITE_COLOR_KEY = 0x00aaaaaa; static const uint32_t SPRITE_COLOR_KEY = 0x00aaaaaa;
uint32_t *fb_ptr;
/* /*
* Mode setting with the kernel interfaces is a bit of a chore. * Mode setting with the kernel interfaces is a bit of a chore.
@ -213,6 +212,11 @@ static void
paint_color_key(struct kmstest_fb *fb_info) paint_color_key(struct kmstest_fb *fb_info)
{ {
int i, j; int i, j;
uint32_t *fb_ptr;
fb_ptr = gem_mmap(drm_fd, fb_info->gem_handle,
fb_info->size, PROT_READ | PROT_WRITE);
igt_assert(fb_ptr);
for (i = crtc_y; i < crtc_y + crtc_h; i++) for (i = crtc_y; i < crtc_y + crtc_h; i++)
for (j = crtc_x; j < crtc_x + crtc_w; j++) { for (j = crtc_x; j < crtc_x + crtc_w; j++) {
@ -221,6 +225,8 @@ paint_color_key(struct kmstest_fb *fb_info)
offset = (i * fb_info->stride / 4) + j; offset = (i * fb_info->stride / 4) + j;
fb_ptr[offset] = SPRITE_COLOR_KEY; fb_ptr[offset] = SPRITE_COLOR_KEY;
} }
munmap(fb_ptr, fb_info->size);
} }
static void paint_image(cairo_t *cr, const char *file) static void paint_image(cairo_t *cr, const char *file)
@ -358,10 +364,6 @@ set_mode(struct connector *c)
fb_id = kmstest_create_fb(drm_fd, width, height, bpp, depth, fb_id = kmstest_create_fb(drm_fd, width, height, bpp, depth,
enable_tiling, &fb_info); enable_tiling, &fb_info);
paint_output_info(c, &fb_info); paint_output_info(c, &fb_info);
fb_ptr = gem_mmap(drm_fd, fb_info.gem_handle,
fb_info.size, PROT_READ | PROT_WRITE);
igt_assert(fb_ptr);
paint_color_key(&fb_info); paint_color_key(&fb_info);
gem_close(drm_fd, fb_info.gem_handle); gem_close(drm_fd, fb_info.gem_handle);