lib/igt_debugfs: drop drm_fd argument from igt_pipe_crc_new

It's nowhere used and removing it gives us a cleaner, more
orthogonal interface.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-03-12 19:24:00 +01:00
parent 803d07b2ff
commit 36a83a6c5c
6 changed files with 6 additions and 9 deletions

View File

@ -136,8 +136,6 @@ char *igt_crc_to_string(igt_crc_t *crc)
#define PIPE_CRC_BUFFER_LEN (PIPE_CRC_LINE_LEN + 1) #define PIPE_CRC_BUFFER_LEN (PIPE_CRC_LINE_LEN + 1)
struct _igt_pipe_crc { struct _igt_pipe_crc {
int drm_fd;
int ctl_fd; int ctl_fd;
int crc_fd; int crc_fd;
int line_len; int line_len;
@ -226,7 +224,7 @@ void igt_pipe_crc_check(igt_debugfs_t *debugfs)
} }
igt_pipe_crc_t * igt_pipe_crc_t *
igt_pipe_crc_new(igt_debugfs_t *debugfs, int drm_fd, enum pipe pipe, igt_pipe_crc_new(igt_debugfs_t *debugfs, enum pipe pipe,
enum intel_pipe_crc_source source) enum intel_pipe_crc_source source)
{ {
igt_pipe_crc_t *pipe_crc; igt_pipe_crc_t *pipe_crc;
@ -246,7 +244,6 @@ igt_pipe_crc_new(igt_debugfs_t *debugfs, int drm_fd, enum pipe pipe,
pipe_crc->line_len = PIPE_CRC_LINE_LEN; pipe_crc->line_len = PIPE_CRC_LINE_LEN;
pipe_crc->buffer_len = PIPE_CRC_BUFFER_LEN; pipe_crc->buffer_len = PIPE_CRC_BUFFER_LEN;
pipe_crc->drm_fd = drm_fd;
pipe_crc->pipe = pipe; pipe_crc->pipe = pipe;
pipe_crc->source = source; pipe_crc->source = source;

View File

@ -72,7 +72,7 @@ char *igt_crc_to_string(igt_crc_t *crc);
void igt_pipe_crc_check(igt_debugfs_t *debugfs); void igt_pipe_crc_check(igt_debugfs_t *debugfs);
igt_pipe_crc_t * igt_pipe_crc_t *
igt_pipe_crc_new(igt_debugfs_t *debugfs, int drm_fd, enum pipe pipe, igt_pipe_crc_new(igt_debugfs_t *debugfs, enum pipe pipe,
enum intel_pipe_crc_source source); enum intel_pipe_crc_source source);
void igt_pipe_crc_free(igt_pipe_crc_t *pipe_crc); void igt_pipe_crc_free(igt_pipe_crc_t *pipe_crc);
void igt_pipe_crc_start(igt_pipe_crc_t *pipe_crc); void igt_pipe_crc_start(igt_pipe_crc_t *pipe_crc);

View File

@ -63,7 +63,7 @@ static igt_pipe_crc_t *create_crc(data_t *data, enum pipe pipe)
{ {
igt_pipe_crc_t *crc; igt_pipe_crc_t *crc;
crc = igt_pipe_crc_new(&data->debugfs, data->drm_fd, pipe, crc = igt_pipe_crc_new(&data->debugfs, pipe,
INTEL_PIPE_CRC_SOURCE_AUTO); INTEL_PIPE_CRC_SOURCE_AUTO);
return crc; return crc;
} }

View File

@ -352,7 +352,7 @@ static bool prepare_crtc(data_t *data, uint32_t connector_id, enum test_mode mod
data->pipe_crc[data->crtc_idx] = NULL; data->pipe_crc[data->crtc_idx] = NULL;
pipe_crc = igt_pipe_crc_new(&data->debugfs, pipe_crc = igt_pipe_crc_new(&data->debugfs,
data->drm_fd, data->crtc_idx, data->crtc_idx,
INTEL_PIPE_CRC_SOURCE_AUTO); INTEL_PIPE_CRC_SOURCE_AUTO);
if (!pipe_crc) { if (!pipe_crc) {
printf("auto crc not supported on this connector with crtc %i\n", printf("auto crc not supported on this connector with crtc %i\n",

View File

@ -88,7 +88,7 @@ static void test_read_crc(data_t *data, int pipe, unsigned flags)
igt_display_commit(display); igt_display_commit(display);
pipe_crc = igt_pipe_crc_new(&data->debugfs, data->drm_fd, pipe_crc = igt_pipe_crc_new(&data->debugfs,
pipe, INTEL_PIPE_CRC_SOURCE_AUTO); pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
if (!pipe_crc) if (!pipe_crc)

View File

@ -92,7 +92,7 @@ test_position_init(test_position_t *test, igt_output_t *output, enum pipe pipe)
drmModeModeInfo *mode; drmModeModeInfo *mode;
igt_plane_t *primary; igt_plane_t *primary;
test->pipe_crc = igt_pipe_crc_new(&data->debugfs, data->drm_fd, test->pipe_crc = igt_pipe_crc_new(&data->debugfs,
pipe, INTEL_PIPE_CRC_SOURCE_AUTO); pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
igt_output_set_pipe(output, pipe); igt_output_set_pipe(output, pipe);