mirror of
				https://github.com/tiagovignatti/intel-gpu-tools.git
				synced 2025-11-04 12:07:12 +00:00 
			
		
		
		
	tests/kms_cursor_crc: Restore the valid pipe/connector combo check
The valid pipe/connector combo check was lost in
 commit 57259d714d3fe1170cf931af72648219856a9918
 Author: Daniel Vetter <daniel.vetter@ffwll.ch>
 Date:   Mon Nov 24 16:08:32 2014 +0100
    lib/igt_debugfs: Don't setup crc in _new
Restore it to make the test again useful on CHV.
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
			
			
This commit is contained in:
		
							parent
							
								
									b6f68c10b4
								
							
						
					
					
						commit
						5d46f68eab
					
				@ -230,7 +230,7 @@ static void test_crc_random(data_t *data)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void prepare_crtc(data_t *data, igt_output_t *output,
 | 
			
		||||
static bool prepare_crtc(data_t *data, igt_output_t *output,
 | 
			
		||||
			 int cursor_w, int cursor_h)
 | 
			
		||||
{
 | 
			
		||||
	drmModeModeInfo *mode;
 | 
			
		||||
@ -245,7 +245,7 @@ static void prepare_crtc(data_t *data, igt_output_t *output,
 | 
			
		||||
	if (!output->valid) {
 | 
			
		||||
		igt_output_set_pipe(output, PIPE_ANY);
 | 
			
		||||
		igt_display_commit(display);
 | 
			
		||||
		return;
 | 
			
		||||
		return false;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/* create and set the primary plane fb */
 | 
			
		||||
@ -284,6 +284,8 @@ static void prepare_crtc(data_t *data, igt_output_t *output,
 | 
			
		||||
 | 
			
		||||
	/* get reference crc w/o cursor */
 | 
			
		||||
	igt_pipe_crc_collect_crc(data->pipe_crc, &data->ref_crc);
 | 
			
		||||
 | 
			
		||||
	return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void cleanup_crtc(data_t *data, igt_output_t *output)
 | 
			
		||||
@ -318,7 +320,8 @@ static void run_test(data_t *data, void (*testfunc)(data_t *), int cursor_w, int
 | 
			
		||||
		for_each_pipe(display, p) {
 | 
			
		||||
			data->pipe = p;
 | 
			
		||||
 | 
			
		||||
			prepare_crtc(data, output, cursor_w, cursor_h);
 | 
			
		||||
			if (!prepare_crtc(data, output, cursor_w, cursor_h))
 | 
			
		||||
				continue;
 | 
			
		||||
 | 
			
		||||
			valid_tests++;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user