From 0396273972076909f92429503232cff1be38e640 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Tue, 3 Sep 2013 14:57:31 +0100 Subject: [PATCH] testdisplay: Move the code sanitizing depth into main() It'll be shared by the set_mode() and set_3d_mode() functions. Signed-off-by: Damien Lespiau --- tests/testdisplay.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/testdisplay.c b/tests/testdisplay.c index 6c39b68..c3a0d04 100644 --- a/tests/testdisplay.c +++ b/tests/testdisplay.c @@ -334,13 +334,6 @@ set_mode(struct connector *c) unsigned int fb_id = 0; int j, test_mode_num; - if (depth <= 8) - bpp = 8; - else if (depth > 8 && depth <= 16) - bpp = 16; - else if (depth > 16 && depth <= 32) - bpp = 32; - test_mode_num = 1; if (force_mode){ memcpy( &c->mode, &force_timing, sizeof(force_timing)); @@ -585,6 +578,14 @@ int main(int argc, char **argv) break; } } + + if (depth <= 8) + bpp = 8; + else if (depth <= 16) + bpp = 16; + else if (depth <= 32) + bpp = 32; + if (!test_all_modes && !force_mode && !dump_info && !test_preferred_mode && specified_mode_num == -1) test_all_modes = 1; -- 2.7.4