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

lib: keep a list of modified connectors to reset

Browse Source 
Avoid calling functions in igt_reset_connectors that are not safe to use
in signal handlers by keeping a list of connectors that have been
modified, instead of enumerating all connectors.

v2: add space for a sentinel NULL value on forced_connectors and print a
    warning when the connector limit is reached (Chris Wilson)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83498
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Thomas Wood 2014-09-04 11:35:01 +01:00
parent 48da0e69ad
commit f675f6771b
1 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/igt_kms.c
View File

@ -55,6 +55,9 @@
#define DRM_PLANE_TYPE_PRIMARY 1 #define DRM_PLANE_TYPE_PRIMARY 1
#define DRM_PLANE_TYPE_CURSOR 2 #define DRM_PLANE_TYPE_CURSOR 2
/* list of connectors that need resetting on exit */
#define MAX_CONNECTORS 32
static char *forced_connectors[MAX_CONNECTORS + 1];
/** /**
@ -342,9 +345,9 @@ static char* get_debugfs_connector_path(int drm_fd, drmModeConnector *connector,
bool kmstest_force_connector(int drm_fd, drmModeConnector *connector, bool kmstest_force_connector(int drm_fd, drmModeConnector *connector,
enum kmstest_force_connector_state state) enum kmstest_force_connector_state state)
{ {
char *path; char *path, **tmp;
const char *value; const char *value;
int debugfs_fd, ret; int debugfs_fd, ret, len;
uint32_t devid; uint32_t devid;
devid = intel_get_drm_devid(drm_fd); devid = intel_get_drm_devid(drm_fd);
@ -376,7 +379,6 @@ bool kmstest_force_connector(int drm_fd, drmModeConnector *connector,
path = get_debugfs_connector_path(drm_fd, connector, "force"); path = get_debugfs_connector_path(drm_fd, connector, "force");
debugfs_fd = open(path, O_WRONLY | O_TRUNC); debugfs_fd = open(path, O_WRONLY | O_TRUNC);
free(path);
if (debugfs_fd == -1) { if (debugfs_fd == -1) {
return false; return false;
@ -385,6 +387,31 @@ bool kmstest_force_connector(int drm_fd, drmModeConnector *connector,
ret = write(debugfs_fd, value, strlen(value)); ret = write(debugfs_fd, value, strlen(value));
close(debugfs_fd); close(debugfs_fd);
for (len = 0, tmp = forced_connectors; *tmp; tmp++) {
/* check the connector is not already present */
if (strcmp(*tmp, path) == 0) {
len = -1;
break;
}
len++;
}
if (len != -1 && len < MAX_CONNECTORS)
forced_connectors[len] = path;
if (len >= MAX_CONNECTORS)
igt_warn("Connector limit reached, %s will not be reset\n",
path);
igt_debug("Connector %s is now forced %s\n", path, value);
igt_debug("Current forced connectors:\n");
tmp = forced_connectors;
while (*tmp) {
igt_debug("\t%s\n", *tmp);
tmp++;
}
igt_assert(ret != -1); igt_assert(ret != -1);
return (ret == -1) ? false : true; return (ret == -1) ? false : true;
} }
@ -1735,21 +1762,14 @@ void igt_enable_connectors(void)
*/ */
void igt_reset_connectors(void) void igt_reset_connectors(void)
{ {
drmModeRes *res; char **tmp;
drmModeConnector *c;
int drm_fd;
drm_fd = drm_open_any(); /* reset the connectors stored in forced_connectors, avoiding any
res = drmModeGetResources(drm_fd); * functions that are not safe to call in signal handlers */
for (int i = 0; i < res->count_connectors; i++) { for (tmp = forced_connectors; *tmp; tmp++) {
int fd = open(*tmp, O_WRONLY | O_TRUNC);
c = drmModeGetConnector(drm_fd, res->connectors[i]); write(fd, "unspecified", 11);
close(fd);
kmstest_force_connector(drm_fd, c, FORCE_CONNECTOR_UNSPECIFIED);
drmModeFreeConnector(c);
} }
close(drm_fd);
} }