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

lib/igt_debugfs: Remove debugfs from igt_debugfs_fopen

Browse Source 
Also add a missing igt_assert to kms_fbc_crc and again add the missing
Returns: section to the api doc.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-03-16 14:46:39 +01:00
parent f04f17bcd4
commit 9a7609a8e4
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/igt_debugfs.c
View File

@ -162,18 +162,25 @@ int igt_debugfs_open(const char *filename, int mode)
/** /**
* igt_debugfs_fopen: * igt_debugfs_fopen:
* @debugfs: debugfs access structure
* @filename: name of the debugfs node to open * @filename: name of the debugfs node to open
* @mode: mode string as used by fopen() * @mode: mode string as used by fopen()
* *
* This opens a debugfs file as a libc FILE. The filename should be * This opens a debugfs file as a libc FILE. The filename should be
* relative to the drm device's root, i.e without "drm/&lt;minor&gt;". * relative to the drm device's root, i.e without "drm/&lt;minor&gt;".
*
* Returns:
* The libc FILE pointer for the debugfs file or NULL if that didn't work out.
*/ */
FILE *igt_debugfs_fopen(igt_debugfs_t *debugfs, const char *filename, FILE *igt_debugfs_fopen(const char *filename,
const char *mode) const char *mode)
{ {
char buf[1024]; char buf[1024];
igt_debugfs_t *debugfs = __igt_debugfs_singleton();
if (!debugfs)
return NULL;
sprintf(buf, "%s/%s", debugfs->dri_path, filename); sprintf(buf, "%s/%s", debugfs->dri_path, filename);
return fopen(buf, mode); return fopen(buf, mode);
} }
@ -334,7 +341,7 @@ void igt_pipe_crc_check(igt_debugfs_t *debugfs)
size_t written; size_t written;
int ret; int ret;
ctl = igt_debugfs_fopen(debugfs, "i915_display_crc_ctl", "r+"); ctl = igt_debugfs_fopen("i915_display_crc_ctl", "r+");
igt_require_f(ctl, igt_require_f(ctl,
"No display_crc_ctl found, kernel too old\n"); "No display_crc_ctl found, kernel too old\n");
written = fwrite(cmd, 1, strlen(cmd), ctl); written = fwrite(cmd, 1, strlen(cmd), ctl);

2
lib/igt_debugfs.h
View File

@ -43,7 +43,7 @@ typedef struct {
void igt_debugfs_init(igt_debugfs_t *debugfs); void igt_debugfs_init(igt_debugfs_t *debugfs);
int igt_debugfs_open(const char *filename, int mode); int igt_debugfs_open(const char *filename, int mode);
FILE *igt_debugfs_fopen(igt_debugfs_t *debugfs, const char *filename, FILE *igt_debugfs_fopen(const char *filename,
const char *mode); const char *mode);
/* /*

6
tests/kms_fbc_crc.c
View File

@ -239,7 +239,9 @@ static bool fbc_enabled(data_t *data)
FILE *status; FILE *status;
char str[64] = {}; char str[64] = {};
status = igt_debugfs_fopen(&data->debugfs, "i915_fbc_status", "r"); status = igt_debugfs_fopen("i915_fbc_status", "r");
igt_assert(status);
fread(str, sizeof(str) - 1, 1, status); fread(str, sizeof(str) - 1, 1, status);
fclose(status); fclose(status);
return strstr(str, "FBC enabled") != NULL; return strstr(str, "FBC enabled") != NULL;
@ -494,7 +496,7 @@ igt_main
igt_debugfs_init(&data.debugfs); igt_debugfs_init(&data.debugfs);
igt_pipe_crc_check(&data.debugfs); igt_pipe_crc_check(&data.debugfs);
status = igt_debugfs_fopen(&data.debugfs, "i915_fbc_status", "r"); status = igt_debugfs_fopen("i915_fbc_status", "r");
igt_require_f(status, "No i915_fbc_status found\n"); igt_require_f(status, "No i915_fbc_status found\n");
fread(buf, sizeof(buf), 1, status); fread(buf, sizeof(buf), 1, status);
fclose(status); fclose(status);

2
tests/kms_pipe_crc_basic.c
View File

@ -43,7 +43,7 @@ static void test_bad_command(data_t *data, const char *cmd)
FILE *ctl; FILE *ctl;
size_t written; size_t written;
ctl = igt_debugfs_fopen(&data->debugfs, "i915_display_crc_ctl", "r+"); ctl = igt_debugfs_fopen("i915_display_crc_ctl", "r+");
written = fwrite(cmd, 1, strlen(cmd), ctl); written = fwrite(cmd, 1, strlen(cmd), ctl);
fflush(ctl); fflush(ctl);
igt_assert_cmpint(written, ==, (strlen(cmd))); igt_assert_cmpint(written, ==, (strlen(cmd)));