Skip to content

Commit 5141a84

Browse files
authored
chore: remove comment
1 parent 1c95346 commit 5141a84

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

patches/linux-gpu-sandbox.patch

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/content/common/gpu_pre_sandbox_hook_linux.cc b/content/common/gpu_pre_sandbox_hook_linux.cc
2-
index 97f7221cb1..85b8566e45 100644
2+
index 97f7221cb1..f159190d33 100644
33
--- a/content/common/gpu_pre_sandbox_hook_linux.cc
44
+++ b/content/common/gpu_pre_sandbox_hook_linux.cc
55
@@ -48,8 +48,8 @@ using sandbox::syscall_broker::BrokerProcess;
@@ -54,20 +54,19 @@ index 97f7221cb1..85b8566e45 100644
5454
"/usr/lib64/dri/nouveau_dri.so",
5555
"/usr/lib64/dri/radeonsi_dri.so",
5656
"/usr/lib64/dri/swrast_dri.so",
57-
@@ -324,6 +333,12 @@ void AddIntelGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
57+
@@ -324,6 +333,11 @@ void AddIntelGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
5858
// To support threads in mesa we use --gpu-sandbox-start-early and
5959
// that requires the following libs and files to be accessible.
6060
"/usr/lib64/libgallium_dri.so",
6161
+#if !BUILDFLAG(IS_CHROMEOS)
62-
+// "/usr/lib64/libgallium-25.0.0.so",
6362
+ "/usr/lib64/libgallium-25.0.2.so",
6463
+ "/usr/lib64/gbm/dri_gbm.so",
6564
+ "/usr/lib64/dri/iHD_drv_video.so",
6665
+#endif
6766
"/usr/lib64/libEGL.so.1", "/usr/lib64/libGLESv2.so.2",
6867
"/usr/lib64/libelf.so.1", "/usr/lib64/libglapi.so.0",
6968
"/usr/lib64/libdrm_amdgpu.so.1", "/usr/lib64/libdrm_radeon.so.1",
70-
@@ -363,6 +378,11 @@ void AddVirtIOGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
69+
@@ -363,6 +377,11 @@ void AddVirtIOGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
7170
"/usr/lib64/libglapi.so.0",
7271
"/usr/lib64/libc++.so.1",
7372
"/usr/lib64/libgallium_dri.so",
@@ -79,7 +78,7 @@ index 97f7221cb1..85b8566e45 100644
7978
// If kms_swrast_dri is not usable, swrast_dri is used instead.
8079
"/usr/lib64/dri/swrast_dri.so",
8180
"/usr/lib64/dri/kms_swrast_dri.so",
82-
@@ -498,9 +518,9 @@ std::vector<BrokerFilePermission> FilePermissionsForGpu(
81+
@@ -498,9 +517,9 @@ std::vector<BrokerFilePermission> FilePermissionsForGpu(
8382

8483
AddVulkanICDPermissions(&permissions);
8584

@@ -91,7 +90,7 @@ index 97f7221cb1..85b8566e45 100644
9190
if (UseV4L2Codec(options))
9291
AddV4L2GpuPermissions(&permissions, options);
9392
if (IsArchitectureArm()) {
94-
@@ -600,10 +620,12 @@ void LoadArmGpuLibraries() {
93+
@@ -600,10 +619,12 @@ void LoadArmGpuLibraries() {
9594

9695
bool LoadAmdGpuLibraries() {
9796
// Preload the amdgpu-dependent libraries.
@@ -104,7 +103,7 @@ index 97f7221cb1..85b8566e45 100644
104103

105104
const char* radeonsi_lib = "/usr/lib64/dri/radeonsi_dri.so";
106105
#if defined(DRI_DRIVER_DIR)
107-
@@ -658,7 +680,7 @@ bool LoadLibrariesForGpu(
106+
@@ -658,7 +679,7 @@ bool LoadLibrariesForGpu(
108107
if (IsArchitectureArm()) {
109108
LoadArmGpuLibraries();
110109
}
@@ -113,7 +112,7 @@ index 97f7221cb1..85b8566e45 100644
113112
if (options.use_amd_specific_policies) {
114113
if (!LoadAmdGpuLibraries())
115114
return false;
116-
@@ -681,7 +703,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
115+
@@ -681,7 +702,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
117116
command_set.set(sandbox::syscall_broker::COMMAND_ACCESS);
118117
command_set.set(sandbox::syscall_broker::COMMAND_OPEN);
119118
command_set.set(sandbox::syscall_broker::COMMAND_STAT);

0 commit comments

Comments
 (0)