4f9d92d
diff -up chromium-83.0.4103.61/chrome/browser/about_flags.cc.vaapi chromium-83.0.4103.61/chrome/browser/about_flags.cc
4f9d92d
--- chromium-83.0.4103.61/chrome/browser/about_flags.cc.vaapi	2020-05-18 14:40:20.000000000 -0400
4f9d92d
+++ chromium-83.0.4103.61/chrome/browser/about_flags.cc	2020-05-29 15:50:25.144232561 -0400
4f9d92d
@@ -2153,7 +2153,7 @@ const FeatureEntry kFeatureEntries[] = {
278c627
         "disable-accelerated-video-decode",
278c627
         flag_descriptions::kAcceleratedVideoDecodeName,
278c627
         flag_descriptions::kAcceleratedVideoDecodeDescription,
278c627
-        kOsMac | kOsWin | kOsCrOS | kOsAndroid,
f1db2ee
+        kOsMac | kOsWin | kOsCrOS | kOsAndroid |  kOsLinux,
278c627
         SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
278c627
     },
f1db2ee
     {
4f9d92d
@@ -2585,12 +2585,12 @@ const FeatureEntry kFeatureEntries[] = {
4f9d92d
      flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
4f9d92d
      MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
278c627
 #endif  // ENABLE_VR
278c627
-#if defined(OS_CHROMEOS)
278c627
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
278c627
     {"disable-accelerated-mjpeg-decode",
278c627
      flag_descriptions::kAcceleratedMjpegDecodeName,
278c627
-     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
278c627
+     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
278c627
      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
278c627
-#endif  // OS_CHROMEOS
4f9d92d
+#endif  // OS_CHROMEOS || OS_LINUX
f1db2ee
     {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
f1db2ee
      flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
f1db2ee
      FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
4f9d92d
diff -up chromium-83.0.4103.61/chrome/browser/flag_descriptions.cc.vaapi chromium-83.0.4103.61/chrome/browser/flag_descriptions.cc
4f9d92d
--- chromium-83.0.4103.61/chrome/browser/flag_descriptions.cc.vaapi	2020-05-18 14:40:21.000000000 -0400
4f9d92d
+++ chromium-83.0.4103.61/chrome/browser/flag_descriptions.cc	2020-05-29 15:47:52.347979793 -0400
4f9d92d
@@ -2980,16 +2980,19 @@ const char kMetalDescription[] =
278c627
 
278c627
 #endif
278c627
 
278c627
-// Chrome OS -------------------------------------------------------------------
f1db2ee
-
278c627
-#if defined(OS_CHROMEOS)
f1db2ee
+// Chrome OS and Linux -------------------------------------------------------------------
278c627
 
f1db2ee
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) 
278c627
 const char kAcceleratedMjpegDecodeName[] =
278c627
     "Hardware-accelerated mjpeg decode for captured frame";
4818465
 const char kAcceleratedMjpegDecodeDescription[] =
278c627
     "Enable hardware-accelerated mjpeg decode for captured frame where "
278c627
     "available.";
f1db2ee
+#endif 
f1db2ee
 
f1db2ee
+// Chrome OS -----------------------------------------------------------------------------
278c627
+
278c627
+#if defined(OS_CHROMEOS)
f1db2ee
 const char kAggregatedMlAppRankingName[] = "Rank suggested apps with ML.";
f1db2ee
 const char kAggregatedMlAppRankingDescription[] =
f1db2ee
     "Use the aggregated ML model to rank the suggested apps.";
4f9d92d
diff -up chromium-83.0.4103.61/chrome/browser/flag_descriptions.h.vaapi chromium-83.0.4103.61/chrome/browser/flag_descriptions.h
4f9d92d
--- chromium-83.0.4103.61/chrome/browser/flag_descriptions.h.vaapi	2020-05-18 14:40:21.000000000 -0400
4f9d92d
+++ chromium-83.0.4103.61/chrome/browser/flag_descriptions.h	2020-05-29 15:47:52.348979768 -0400
4f9d92d
@@ -1711,13 +1711,19 @@ extern const char kMetalDescription[];
278c627
 
278c627
 #endif  // defined(OS_MACOSX)
278c627
 
278c627
-// Chrome OS ------------------------------------------------------------------
f1db2ee
+// Chrome OS and Linux ---------------------------------------------------------
278c627
 
278c627
-#if defined(OS_CHROMEOS)
4818465
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
278c627
 
278c627
 extern const char kAcceleratedMjpegDecodeName[];
278c627
 extern const char kAcceleratedMjpegDecodeDescription[];
278c627
 
f1db2ee
+#endif 
278c627
+
f1db2ee
+// Chrome OS -------------------------------------------------------------------
278c627
+
278c627
+#if defined(OS_CHROMEOS)
278c627
+
f1db2ee
 extern const char kAggregatedMlAppRankingName[];
f1db2ee
 extern const char kAggregatedMlAppRankingDescription[];
278c627
 
4f9d92d
diff -up chromium-83.0.4103.61/gpu/config/software_rendering_list.json.vaapi chromium-83.0.4103.61/gpu/config/software_rendering_list.json
4f9d92d
--- chromium-83.0.4103.61/gpu/config/software_rendering_list.json.vaapi	2020-05-18 14:40:24.000000000 -0400
4f9d92d
+++ chromium-83.0.4103.61/gpu/config/software_rendering_list.json	2020-05-29 15:47:52.349979744 -0400
383f5ae
@@ -337,11 +337,12 @@
278c627
     },
0d5fe2e
     {
4818465
       "id": 48,
4818465
-      "description": "Accelerated video decode is unavailable on Linux",
4818465
+      "description": "Accelerated VA-API video decode is not supported on NVIDIA platforms",
383f5ae
       "cr_bugs": [137247, 1032907],
4818465
       "os": {
4818465
         "type": "linux"
4818465
       },
383f5ae
+      "vendor_id": "0x10de",
383f5ae
       "exceptions": [
383f5ae
         {
383f5ae
           "machine_model_name": ["Chromecast"]