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

lib: Check pipe source validity in igt_pipe_crc_new()

Browse Source 
Have igt_pipe_crc_new() check whether the selected source is actually
supported.

v2: Make debugfs_pipe_crc.c not crash

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
This commit is contained in:
Ville Syrjälä 2013-10-21 18:45:03 +03:00
parent 987bcd9a5b
commit 0786d5cc8f
2 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lib/igt_debugfs.c
View File

@ -145,6 +145,37 @@ struct _igt_pipe_crc {
enum intel_pipe_crc_source source; enum intel_pipe_crc_source source;
}; };
static const char *pipe_crc_sources[] = {
"none",
"plane1",
"plane2",
"pf",
"pipe",
"TV",
"DP-B",
"DP-C",
"DP-D"
};
static const char *pipe_crc_source_name(enum intel_pipe_crc_source source)
{
return pipe_crc_sources[source];
}
static bool igt_pipe_crc_do_start(igt_pipe_crc_t *pipe_crc)
{
char buf[64];
sprintf(buf, "pipe %c %s", pipe_name(pipe_crc->pipe),
pipe_crc_source_name(pipe_crc->source));
errno = 0;
write(pipe_crc->ctl_fd, buf, strlen(buf));
if (errno != 0)
return false;
return true;
}
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, int drm_fd, enum pipe pipe,
enum intel_pipe_crc_source source) enum intel_pipe_crc_source source)
@ -168,6 +199,14 @@ igt_pipe_crc_new(igt_debugfs_t *debugfs, int drm_fd, enum pipe pipe,
pipe_crc->pipe = pipe; pipe_crc->pipe = pipe;
pipe_crc->source = source; pipe_crc->source = source;
/* make sure this source is actually supported */
if (!igt_pipe_crc_do_start(pipe_crc)) {
igt_pipe_crc_free(pipe_crc);
return NULL;
}
igt_pipe_crc_stop(pipe_crc);
return pipe_crc; return pipe_crc;
} }
@ -205,33 +244,11 @@ void igt_pipe_crc_free(igt_pipe_crc_t *pipe_crc)
free(pipe_crc); free(pipe_crc);
} }
static const char *pipe_crc_sources[] = {
"none",
"plane1",
"plane2",
"pf",
"pipe",
"TV",
"DP-B",
"DP-C",
"DP-D"
};
static const char *pipe_crc_source_name(enum intel_pipe_crc_source source)
{
return pipe_crc_sources[source];
}
bool igt_pipe_crc_start(igt_pipe_crc_t *pipe_crc) bool igt_pipe_crc_start(igt_pipe_crc_t *pipe_crc)
{ {
char buf[64];
igt_crc_t *crcs = NULL; igt_crc_t *crcs = NULL;
sprintf(buf, "pipe %c %s", pipe_name(pipe_crc->pipe), if (!igt_pipe_crc_do_start(pipe_crc))
pipe_crc_source_name(pipe_crc->source));
errno = 0;
write(pipe_crc->ctl_fd, buf, strlen(buf));
if (errno != 0)
return false; return false;
/* /*

2
tests/debugfs_pipe_crc.c
View File

@ -173,7 +173,7 @@ static void test_read_crc(data_t *data, int pipe, unsigned flags)
connector_set_mode(data, connector, &connector->config.default_mode); connector_set_mode(data, connector, &connector->config.default_mode);
if (!igt_pipe_crc_start(pipe_crc)) { if (!pipe_crc || !igt_pipe_crc_start(pipe_crc)) {
igt_pipe_crc_free(pipe_crc); igt_pipe_crc_free(pipe_crc);
pipe_crc = igt_pipe_crc_new(&data->debugfs, data->drm_fd, pipe_crc = igt_pipe_crc_new(&data->debugfs, data->drm_fd,
connector->config.pipe, connector->config.pipe,