-
-
Notifications
You must be signed in to change notification settings - Fork 1
/
enable-vaapi-on-linux.diff
170 lines (155 loc) · 8.15 KB
/
enable-vaapi-on-linux.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
diff -up chromium-93.0.4577.42/chrome/browser/about_flags.cc.22~ chromium-93.0.4577.42/chrome/browser/about_flags.cc
--- chromium-93.0.4577.42/chrome/browser/about_flags.cc.22~ 2021-08-12 21:10:08.000000000 +0200
+++ chromium-93.0.4577.42/chrome/browser/about_flags.cc 2021-08-15 05:41:57.783400885 +0200
@@ -3236,7 +3236,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)},
#endif // defined(OS_CHROMEOS)
-#if defined(OS_LINUX)
+#if 0
{
"enable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -3251,7 +3251,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
flag_descriptions::kAcceleratedVideoDecodeDescription,
- kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux,
+ kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
#endif // defined(OS_LINUX)
@@ -3813,10 +3813,10 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
#endif // ENABLE_VR
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if (BUILDFLAG(IS_CHROMEOS_ASH)) || (defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS))
{"disable-accelerated-mjpeg-decode",
flag_descriptions::kAcceleratedMjpegDecodeName,
- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
diff -up chromium-93.0.4577.42/chrome/browser/flag_descriptions.cc.22~ chromium-93.0.4577.42/chrome/browser/flag_descriptions.cc
--- chromium-93.0.4577.42/chrome/browser/flag_descriptions.cc.22~ 2021-08-12 21:10:09.000000000 +0200
+++ chromium-93.0.4577.42/chrome/browser/flag_descriptions.cc 2021-08-15 05:41:57.784400877 +0200
@@ -4022,7 +4022,7 @@ const char kScreenTimeDescription[] =
// Chrome OS -------------------------------------------------------------------
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if (BUILDFLAG(IS_CHROMEOS_ASH)) || (defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS))
const char kAccountManagementFlowsV2Name[] =
"Enable redesign of account management flows";
@@ -4037,6 +4037,12 @@ const char kAcceleratedMjpegDecodeDescri
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
+#endif
+
+// Chrome OS -------------------------------------------------------------------
+
+#if defined(OS_CHROMEOS)
+
const char kAllowDisableMouseAccelerationName[] =
"Allow disabling mouse acceleration";
const char kAllowDisableMouseAccelerationDescription[] =
diff -up chromium-93.0.4577.42/chrome/browser/flag_descriptions.h.22~ chromium-93.0.4577.42/chrome/browser/flag_descriptions.h
--- chromium-93.0.4577.42/chrome/browser/flag_descriptions.h.22~ 2021-08-12 21:10:09.000000000 +0200
+++ chromium-93.0.4577.42/chrome/browser/flag_descriptions.h 2021-08-15 05:41:57.784400877 +0200
@@ -2306,7 +2306,7 @@ extern const char kScreenTimeDescription
// Chrome OS ------------------------------------------------------------------
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if (BUILDFLAG(IS_CHROMEOS_ASH)) || (defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS))
extern const char kAccountManagementFlowsV2Name[];
extern const char kAccountManagementFlowsV2Description[];
@@ -2314,6 +2314,12 @@ extern const char kAccountManagementFlow
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
+#endif
+
+// Chrome OS ------------------------------------------------------------------
+
+#if defined(OS_CHROMEOS)
+
extern const char kAllowDisableMouseAccelerationName[];
extern const char kAllowDisableMouseAccelerationDescription[];
diff -up chromium-93.0.4577.42/content/gpu/BUILD.gn.22~ chromium-93.0.4577.42/content/gpu/BUILD.gn
--- chromium-93.0.4577.42/content/gpu/BUILD.gn.22~ 2021-08-12 21:10:16.000000000 +0200
+++ chromium-93.0.4577.42/content/gpu/BUILD.gn 2021-08-15 05:41:57.785400869 +0200
@@ -6,6 +6,7 @@ import("//build/config/chromeos/ui_mode.
import("//build/config/ui.gni")
import("//gpu/vulkan/features.gni")
import("//media/media_options.gni")
+import("//media/gpu/args.gni")
# See //content/BUILD.gn for how this works.
group("gpu") {
@@ -139,4 +140,8 @@ target(link_target_type, "gpu_sources")
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
+
+ if (is_linux && use_vaapi) {
+ public_configs = [ "//build/config/linux/libva" ]
+ }
}
diff -up chromium-93.0.4577.42/media/gpu/gpu_video_decode_accelerator_factory.cc.22~ chromium-93.0.4577.42/media/gpu/gpu_video_decode_accelerator_factory.cc
--- chromium-93.0.4577.42/media/gpu/gpu_video_decode_accelerator_factory.cc.22~ 2021-08-12 21:10:18.000000000 +0200
+++ chromium-93.0.4577.42/media/gpu/gpu_video_decode_accelerator_factory.cc 2021-08-15 05:41:57.785400869 +0200
@@ -160,6 +160,8 @@ GpuVideoDecodeAcceleratorFactory::Create
vda = (this->*create_vda_function)(workarounds, gpu_preferences, media_log);
if (vda && vda->Initialize(config, client))
return vda;
+ else
+ LOG(ERROR) << "Initialization of one or more VDAs failed.";
}
return nullptr;
diff -up chromium-93.0.4577.42/media/gpu/ipc/service/gpu_video_decode_accelerator.cc.22~ chromium-93.0.4577.42/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
--- chromium-93.0.4577.42/media/gpu/ipc/service/gpu_video_decode_accelerator.cc.22~ 2021-08-12 21:10:18.000000000 +0200
+++ chromium-93.0.4577.42/media/gpu/ipc/service/gpu_video_decode_accelerator.cc 2021-08-15 05:41:57.785400869 +0200
@@ -432,6 +432,7 @@ bool GpuVideoDecodeAccelerator::Initiali
LOG(ERROR) << "Failed creating the VDA factory";
return false;
}
+ LOG(WARNING) << "Created the VDA factory";
const gpu::GpuDriverBugWorkarounds& gpu_workarounds =
stub_->channel()->gpu_channel_manager()->gpu_driver_bug_workarounds();
diff -up chromium-93.0.4577.42/media/gpu/vaapi/vaapi_wrapper.cc.22~ chromium-93.0.4577.42/media/gpu/vaapi/vaapi_wrapper.cc
--- chromium-93.0.4577.42/media/gpu/vaapi/vaapi_wrapper.cc.22~ 2021-08-12 21:10:18.000000000 +0200
+++ chromium-93.0.4577.42/media/gpu/vaapi/vaapi_wrapper.cc 2021-08-15 05:41:57.785400869 +0200
@@ -527,6 +527,11 @@ void VADisplayState::PreSandboxInitializ
base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
if (drm_file.IsValid())
VADisplayState::Get()->SetDrmFd(drm_file.GetPlatformFile());
+
+ const char kNvidiaPath[] = "/dev/dri/nvidiactl";
+ base::File nvidia_file = base::File(
+ base::FilePath::FromUTF8Unsafe(kNvidiaPath),
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
}
VADisplayState::VADisplayState()
@@ -634,10 +639,6 @@ bool VADisplayState::InitializeVaDriver_
}
bool VADisplayState::InitializeOnce() {
- static_assert(
- VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
- "Requires VA-API >= 1.1.0");
-
// Set VA logging level, unless already set.
constexpr char libva_log_level_env[] = "LIBVA_MESSAGING_LEVEL";
std::unique_ptr<base::Environment> env(base::Environment::Create());
@@ -658,7 +659,6 @@ bool VADisplayState::InitializeOnce() {
// https://github.com/intel/media-driver/issues/818
if (!env->HasVar(libva_driver_impl_env))
env->SetVar(libva_driver_impl_env, "i965");
-
// Re-initialize with the new driver.
va_display_ = nullptr;
va_initialized_ = false;
@@ -870,7 +870,7 @@ bool AreAttribsSupported(const base::Loc
if (attribs[i].type != required_attribs[i].type ||
(attribs[i].value & required_attribs[i].value) !=
required_attribs[i].value) {
- DVLOG(1) << "Unsupported value " << required_attribs[i].value << " for "
+ VLOG(1) << "Unsupported value " << required_attribs[i].value << " for "
<< vaConfigAttribTypeStr(required_attribs[i].type);
return false;
}