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

testdisplay: Properly handle the life cycle of framebuffers

Browse Source 
When cycling through the modes, let's make sure to free the previous
framebuffers. This is the perfect occasion to use kmstest_remove_fb().

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

24
tests/testdisplay.c
View File

@ -338,7 +338,8 @@ static void
set_mode(struct connector *c) set_mode(struct connector *c)
{ {
unsigned int fb_id = 0; unsigned int fb_id = 0;
int j, test_mode_num; struct kmstest_fb fb_info[2] = { };
int j, test_mode_num, current_fb = 0, old_fb = -1;
test_mode_num = 1; test_mode_num = 1;
if (force_mode){ if (force_mode){
@ -350,7 +351,6 @@ set_mode(struct connector *c)
test_mode_num = c->connector->count_modes; test_mode_num = c->connector->count_modes;
for (j = 0; j < test_mode_num; j++) { for (j = 0; j < test_mode_num; j++) {
struct kmstest_fb fb_info;
if (test_all_modes) if (test_all_modes)
c->mode = c->connector->modes[j]; c->mode = c->connector->modes[j];
@ -362,11 +362,9 @@ set_mode(struct connector *c)
height = c->mode.vdisplay; height = c->mode.vdisplay;
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[current_fb]);
paint_output_info(c, &fb_info); paint_output_info(c, &fb_info[current_fb]);
paint_color_key(&fb_info); paint_color_key(&fb_info[current_fb]);
gem_close(drm_fd, fb_info.gem_handle);
fprintf(stdout, "CRTS(%u):[%d]",c->crtc, j); fprintf(stdout, "CRTS(%u):[%d]",c->crtc, j);
kmstest_dump_mode(&c->mode); kmstest_dump_mode(&c->mode);
@ -378,6 +376,11 @@ set_mode(struct connector *c)
continue; continue;
} }
if (old_fb != -1)
kmstest_remove_fb(drm_fd, &fb_info[old_fb]);
old_fb = current_fb;
current_fb = 1 - current_fb;
if (sleep_between_modes && test_all_modes && !qr_code) if (sleep_between_modes && test_all_modes && !qr_code)
sleep(sleep_between_modes); sleep(sleep_between_modes);
@ -385,13 +388,10 @@ set_mode(struct connector *c)
set_single(); set_single();
pause(); pause();
} }
} }
if(test_all_modes){ if (test_all_modes)
drmModeRmFB(drm_fd,fb_id); kmstest_remove_fb(drm_fd, &fb_info[old_fb]);
drmModeSetCrtc(drm_fd, c->crtc, fb_id, 0, 0, &c->id, 1, 0);
}
drmModeFreeEncoder(c->encoder); drmModeFreeEncoder(c->encoder);
drmModeFreeConnector(c->connector); drmModeFreeConnector(c->connector);