AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pipe-loader: Add auth_x parameter to pipe_loader_drm_probe_fd()

Browse Source 
The caller can use this boolean parameter to tell the pipe-loader
to authenticate with the X server when probing a file descriptor.
This commit is contained in:
Tom Stellard
2014-01-27 10:34:16 -05:00
parent 0320ba9988
commit 8481d208ce
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/pipe-loader/pipe_loader.h
+5 -1
View File
@@ -128,9 +128,13 @@ pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev);
* This function is platform-specific.
*
* \sa pipe_loader_probe
*
* \param auth_x If true, the pipe-loader will attempt to
* authenticate with the X server.
*/
boolean
pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd);
pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd,
boolean auth_x);
#endif
src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+5 -3
View File
@@ -112,7 +112,8 @@ disconnect:
}
boolean
pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd)
pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd,
boolean auth_x)
{
struct pipe_loader_drm_device *ddev = CALLOC_STRUCT(pipe_loader_drm_device);
int vendor_id, chip_id;
@@ -127,7 +128,8 @@ pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd)
ddev->base.ops = &pipe_loader_drm_ops;
ddev->fd = fd;
pipe_loader_drm_x_auth(fd);
if (auth_x)
pipe_loader_drm_x_auth(fd);
ddev->base.driver_name = loader_get_driver_for_fd(fd, _LOADER_GALLIUM);
if (!ddev->base.driver_name)
@@ -159,7 +161,7 @@ pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev)
if (fd < 0)
continue;
if (j >= ndev || !pipe_loader_drm_probe_fd(&devs[j], fd))
if (j >= ndev || !pipe_loader_drm_probe_fd(&devs[j], fd, true))
close(fd);
j++;
src/gallium/targets/gbm/gbm.c
+1 -1
View File
@@ -52,7 +52,7 @@ gallium_screen_create(struct gbm_gallium_drm_device *gdrm)
#ifdef HAVE_PIPE_LOADER_DRM
int ret;
ret = pipe_loader_drm_probe_fd(&dev, gdrm->base.base.fd);
ret = pipe_loader_drm_probe_fd(&dev, gdrm->base.base.fd, true);
if (!ret)
return -1;
#endif /* HAVE_PIPE_LOADER_DRM */