Fix NV12 overlays GPU test expectation on Intel HD 630 26.20.100.8141

Hardware overlays are disabled in this driver per crbug.com/1079393#c105

Re-enable some tests that pass with the new expectation

Bug: 1079393
Change-Id: I53eda3767ed935ba3a01c7610812de3d6dae7da8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2548340Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Sunny Sachanandani <sunnyps@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829004}

content/test/gpu/gpu_tests/gpu_integration_test.py

@@ -25,6 +25,8 @@ _SUPPORTED_WIN_GPU_VENDORS = [0x8086, 0x10de, 0x1002]
 _SUPPORTED_WIN_INTEL_GPUS = [0x5912, 0x3e92]
 _SUPPORTED_WIN_INTEL_GPUS_WITH_YUY2_OVERLAYS = [0x5912, 0x3e92]
 _SUPPORTED_WIN_INTEL_GPUS_WITH_NV12_OVERLAYS = [0x5912, 0x3e92]
+# Hardware overlays are disabled in 26.20.100.8141 per crbug.com/1079393#c105
+_UNSUPPORTED_WIN_INTEL_GPU_DRIVERS_WITH_NV12_OVERLAYS = ['5912-26.20.100.8141']
 
 
 class GpuIntegrationTest(
@@ -458,9 +460,12 @@ class GpuIntegrationTest(
       config['nv12_overlay_support'] = 'SOFTWARE'
       if gpu_vendor_id == 0x8086:
         assert gpu_device_id in _SUPPORTED_WIN_INTEL_GPUS
+        gpu_device_and_driver = ('%x-' + gpu.driver_version) % gpu_device_id
         if gpu_device_id in _SUPPORTED_WIN_INTEL_GPUS_WITH_YUY2_OVERLAYS:
           config['yuy2_overlay_support'] = 'SCALING'
-        if gpu_device_id in _SUPPORTED_WIN_INTEL_GPUS_WITH_NV12_OVERLAYS:
+        if (gpu_device_id in _SUPPORTED_WIN_INTEL_GPUS_WITH_NV12_OVERLAYS
+            and gpu_device_and_driver not in
+            _UNSUPPORTED_WIN_INTEL_GPU_DRIVERS_WITH_NV12_OVERLAYS):
           config['nv12_overlay_support'] = 'SCALING'
     return config
 

content/test/gpu/gpu_tests/test_expectations/info_collection_expectations.txt

@@ -59,10 +59,6 @@
 # Incorrectly reporting SCALING instead of DIRECT on Win10 w/ UHD 630 GPUs.
 crbug.com/1079393 [ win intel-0x3e92 ] InfoCollection_direct_composition [ Failure ]
 
-# Incorrectly reporting SOFTWARE instead of SCALING for nv12_overlay_support on
-# Win10 w/ HD 630 GPUs and driver 26.20.100.8141
-crbug.com/1079393 [ win intel-0x5912 ] InfoCollection_direct_composition [ Failure ]
-
 # NVIDIA bots need 456.38+ drivers to use SOFTWARE overlays.
 crbug.com/1113893 [ win nvidia ] InfoCollection_direct_composition [ Failure ]
 

content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt

@@ -156,10 +156,6 @@ crbug.com/1079393 [ win10 intel-0x5912 ] OverlayModeTraceTest_DirectComposition_
 crbug.com/1079393 [ win10 intel-0x5912 ] OverlayModeTraceTest_DirectComposition_Video_VP9_NV12 [ Failure ]
 crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Underlay_Fullsize [ Failure ]
 crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_Fullsize [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_NV12 [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_VP_SCALING [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_VP9_NV12 [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_VP9_VP_SCALING [ Failure ]
 
 # Fuchsia Flakes.
 crbug.com/1058255 [ fuchsia ] TraceTest_WebGLGreenTriangle_AA_Alpha [ Skip ]