Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add IA32 and Display support #246

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add IA32 and Display support #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/nvc_info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
nitems(utility_libs) + \
nitems(compute_libs) + \
nitems(video_libs) + \
nitems(display_libs) + \
nitems(graphics_libs) + \
nitems(graphics_libs_glvnd) + \
nitems(graphics_libs_compat))
Expand Down Expand Up @@ -57,6 +58,12 @@ static void clear_mig_device_info(struct nvc_mig_device_info *);
* "libglx.so" // GLX extension module for X server
*/

static const char * const display_libs[] = {
"libnvidia-wfb.so", /* Wrapped software rendering module for X server */
"libnvidia_drv.so", /* Driver module for X server */
"libglxserver_nvidia.so", /* GLX extension module for X server */
};

static const char * const utility_bins[] = {
"nvidia-smi", /* System management interface */
"nvidia-debugdump", /* GPU coredump utility */
Expand Down Expand Up @@ -384,6 +391,7 @@ lookup_libraries(struct error *err, struct dxcore_context *dxcore, struct nvc_dr
ptr = array_append(ptr, compute_libs, nitems(compute_libs));
ptr = array_append(ptr, ngx_libs, nitems(ngx_libs));
ptr = array_append(ptr, video_libs, nitems(video_libs));
ptr = array_append(ptr, display_libs, nitems(display_libs));
ptr = array_append(ptr, graphics_libs, nitems(graphics_libs));
if (flags & OPT_NO_GLVND)
ptr = array_append(ptr, graphics_libs_compat, nitems(graphics_libs_compat));
Expand Down Expand Up @@ -772,6 +780,8 @@ match_library_flags(const char *lib, int32_t flags)
return (true);
if ((flags & OPT_VIDEO_LIBS) && str_array_match_prefix(lib, video_libs, nitems(video_libs)))
return (true);
if ((flags & OPT_DISPLAY_LIBS) && str_array_match_prefix(lib, display_libs, nitems(display_libs)))
return (true);
if ((flags & OPT_GRAPHICS_LIBS) && (str_array_match_prefix(lib, graphics_libs, nitems(graphics_libs)) ||
str_array_match_prefix(lib, graphics_libs_glvnd, nitems(graphics_libs_glvnd)) ||
str_array_match_prefix(lib, graphics_libs_compat, nitems(graphics_libs_compat))))
Expand Down
10 changes: 10 additions & 0 deletions src/nvc_mount.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,10 +549,20 @@ symlink_libraries(struct error *err, const struct nvc_container *cnt, const char
/* XXX GLVND requires this symlink for indirect GLX support. */
if (symlink_library(err, paths[i], lib, "libGLX_indirect.so.0", cnt->uid, cnt->gid) < 0)
return (-1);
/* XXX Link libGL.so.1 required for libs32 */
if(strstr(paths[i], "i386-linux-gnu")) {
if (symlink_library(err, paths[i], lib, "libGL.so.1", cnt->uid, cnt->gid) < 0)
return (-1);
} else if (str_has_prefix(lib, "libnvidia-opticalflow.so")) {
/* XXX Fix missing symlink for libnvidia-opticalflow.so. */
if (symlink_library(err, paths[i], "libnvidia-opticalflow.so.1", "libnvidia-opticalflow.so", cnt->uid, cnt->gid) < 0)
return (-1);
} else if (str_has_prefix(lib, "libnvidia_drv.so")) {
if (symlink_library(err, paths[i], lib, "libnvidia_drv.so", cnt->uid, cnt->gid) < 0)
return (-1);
} else if (str_has_prefix(lib, "libglxserver_nvidia.so")) {
if (symlink_library(err, paths[i], lib, "libglxserver_nvidia.so", cnt->uid, cnt->gid) < 0)
return (-1);
}
}
return (0);
Expand Down
5 changes: 3 additions & 2 deletions src/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,11 @@ enum {
OPT_DISPLAY = 1 << 10,
OPT_UTILITY_BINS = 1 << 11,
OPT_COMPUTE_BINS = 1 << 12,
OPT_DISPLAY_LIBS = 1 << 13,
#if defined(__powerpc64__) /* ppc64le doesn't support compat32. */
OPT_COMPAT32 = 1 << 0,
#else
OPT_COMPAT32 = 1 << 13,
OPT_COMPAT32 = 1 << 14,
#endif /* defined(__powerpc64__) */
};

Expand All @@ -83,7 +84,7 @@ static const struct option container_opts[] = {
{"compute", OPT_COMPUTE_BINS|OPT_COMPUTE_LIBS},
{"video", OPT_VIDEO_LIBS|OPT_COMPUTE_LIBS},
{"graphics", OPT_GRAPHICS_LIBS},
{"display", OPT_DISPLAY|OPT_GRAPHICS_LIBS},
{"display", OPT_DISPLAY|OPT_GRAPHICS_LIBS|OPT_DISPLAY_LIBS},
{"ngx", OPT_NGX_LIBS},
{"compat32", OPT_COMPAT32},
};
Expand Down