diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2013-09-04 12:12:37 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2013-09-30 18:04:21 +0100 |
| commit | 5a1d84300ba31bec08c05db7d1c602c80e932021 (patch) | |
| tree | b2be76263fb24a4240e2396f0aa060d012068a7f /tests/testdisplay.c | |
| parent | 0396273972076909f92429503232cff1be38e640 (diff) | |
testdisplay: Map the fb inside paint_color_key()
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>
Diffstat (limited to 'tests/testdisplay.c')
| -rw-r--r-- | tests/testdisplay.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/testdisplay.c b/tests/testdisplay.c index c3a0d049..3d696a06 100644 --- a/tests/testdisplay.c +++ b/tests/testdisplay.c @@ -82,7 +82,6 @@ unsigned int plane_crtc_id; unsigned int plane_id; int plane_width, plane_height; static const uint32_t SPRITE_COLOR_KEY = 0x00aaaaaa; -uint32_t *fb_ptr; /* * 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) { 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 (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; fb_ptr[offset] = SPRITE_COLOR_KEY; } + + munmap(fb_ptr, fb_info->size); } 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, enable_tiling, &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); gem_close(drm_fd, fb_info.gem_handle); |