flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2026-08-20 12:52:55 +00:00
Code Issues Releases Wiki Activity

lib/drmtest: rip out drm_open_any_master

Browse Source 
It's unused. Also most of our tests failed to ask for the right type
of drm fd anyway. So it's imo better to just let them fall over when
they don't get master but want it, like they already do today.

This also allows us to garbage-collect the master parameter to
drm_get_card and associated code.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter
2013-08-19 10:34:34 +02:00
parent 4ba1f2e104
commit 5951ffb6a0
9 changed files with 12 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/drmtest.c
+3 -55
View File
@@ -165,26 +165,6 @@ void gem_quiescent_gpu(int fd)
gem_sync(fd, handle);
}
static bool is_master(int fd)
{
drm_client_t client;
int ret;
/* Check that we're the only opener and authed. */
client.idx = 0;
ret = ioctl(fd, DRM_IOCTL_GET_CLIENT, &client);
igt_assert (ret == 0);
if (!client.auth) {
return 0;
}
client.idx = 1;
ret = ioctl(fd, DRM_IOCTL_GET_CLIENT, &client);
if (ret != -1 || errno != EINVAL) {
return 0;
}
return 1;
}
/**
* drm_get_card() - get an intel card number for use in /dev or /sys
*
@@ -192,7 +172,7 @@ static bool is_master(int fd)
*
* returns -1 on error
*/
int drm_get_card(int master)
int drm_get_card(void)
{
char *name;
int i, fd;
@@ -209,17 +189,7 @@ int drm_get_card(int master)
if (fd == -1)
continue;
if (is_intel(fd) && master == 0) {
close(fd);
break;
}
if (master == 1 && is_master(fd)) {
close(fd);
break;
}
if (master == -1 && !is_master(fd)) {
if (is_intel(fd)) {
close(fd);
break;
}
@@ -236,7 +206,7 @@ static int __drm_open_any(void)
char *name;
int ret, fd;
ret = asprintf(&name, "/dev/dri/card%d", drm_get_card(0));
ret = asprintf(&name, "/dev/dri/card%d", drm_get_card());
if (ret == -1)
return -1;
@@ -278,28 +248,6 @@ int drm_open_any(void)
return fd;
}
/**
* Open the first DRM device we can find where we end up being the master.
*/
int drm_open_any_master(void)
{
char *name;
int ret, fd;
ret = asprintf(&name, "/dev/dri/card%d", drm_get_card(1));
if (ret == -1)
return -1;
fd = open(name, O_RDWR);
free(name);
if (fd == -1)
fprintf(stderr, "Couldn't find an un-controlled DRM device\n");
igt_assert(is_intel(fd));
return fd;
}
void gem_set_tiling(int fd, uint32_t handle, int tiling, int stride)
{
struct drm_i915_gem_set_tiling st;
lib/drmtest.h
+1 -2
View File
@@ -44,9 +44,8 @@
drm_intel_bo * gem_handle_to_libdrm_bo(drm_intel_bufmgr *bufmgr, int fd,
const char *name, uint32_t handle);
int drm_get_card(int master);
int drm_get_card(void);
int drm_open_any(void);
int drm_open_any_master(void);
void gem_quiescent_gpu(int fd);