From 6cd096da8a1c7445efd58a395ffe624b7d2f3301 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Fri, 13 Oct 2023 14:40:31 +0200 Subject: [Backport] Add Intel Raptorlake GPU series type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This also enables supports_two_yuv_hardware_overlays on it. Bug: 1062334 Change-Id: Ieba553f29d840768148f3437ce1abcb9969ad243 Review-URL: https://chromium-review.googlesource.com/c/chromium/src/+/3969628 Cr-Commit-Position: refs/heads/main@{#1063149} Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/511749 Reviewed-by: Michael Brüning (cherry picked from commit c45073961c27d7788532c7126e0fe3fdec651d60) Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/511910 Reviewed-by: Allan Sandfeld Jensen --- chromium/gpu/config/gpu_control_list_format.txt | 7 ++++--- chromium/gpu/config/gpu_info.h | 5 +++-- chromium/gpu/config/gpu_util.cc | 3 +++ chromium/gpu/config/process_json.py | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/chromium/gpu/config/gpu_control_list_format.txt b/chromium/gpu/config/gpu_control_list_format.txt index b7679265369..fc299f8a369 100644 --- a/chromium/gpu/config/gpu_control_list_format.txt +++ b/chromium/gpu/config/gpu_control_list_format.txt @@ -77,9 +77,10 @@ // 29. "intel_gpu_series" is a list of gpu series names. Currently supported // series include: "broadwater", "eaglelake", "ironlake", "sandybridge", // "baytrail", "ivybridge", "haswell", "cherrytrail", "broadwell", -// "apollolake", "skylake", "geminilake", "kabylake", "coffeelake", -// "whiskeylake", "cometlake", "cannonlake", "icelake", "elkhartlake", -// "jasperlake", "tigerlake", "alderlake". +// "apollolake", "skylake", "geminilake", "kabylake", "amberlake", +// "coffeelake", "whiskeylake", "cometlake", "cannonlake", "icelake", +// "elkhartlake", "jasperlake", "tigerlake", "rocketlake", "DG1", +// "alderlake", "alchemist", "raptorlake". // 30. "hardware_overlay" is either "supported" or "unsupported". Currently it // only applies on Windows where hardware overlays may be supported on // certain Intel GPUs. By default it's "dont_care" and there is no need to diff --git a/chromium/gpu/config/gpu_info.h b/chromium/gpu/config/gpu_info.h index fe4903ebb81..e450e82fc63 100644 --- a/chromium/gpu/config/gpu_info.h +++ b/chromium/gpu/config/gpu_info.h @@ -57,8 +57,8 @@ enum class IntelGpuSeriesType { kApollolake = 7, kSkylake = 8, kGeminilake = 9, - kAmberlake = 23, kKabylake = 10, + kAmberlake = 23, kCoffeelake = 11, kWhiskeylake = 12, kCometlake = 13, @@ -74,8 +74,9 @@ enum class IntelGpuSeriesType { kDG1 = 25, kAlderlake = 22, kAlchemist = 26, + kRaptorlake = 27, // Please also update |gpu_series_map| in process_json.py. - kMaxValue = kAlchemist, + kMaxValue = kRaptorlake, }; // Video profile. This *must* match media::VideoCodecProfile. diff --git a/chromium/gpu/config/gpu_util.cc b/chromium/gpu/config/gpu_util.cc index 7c92901df04..245645d410e 100644 --- a/chromium/gpu/config/gpu_util.cc +++ b/chromium/gpu/config/gpu_util.cc @@ -905,6 +905,8 @@ IntelGpuSeriesType GetIntelGpuSeriesType(uint32_t vendor_id, case 0x4F00: case 0x5600: return IntelGpuSeriesType::kAlchemist; + case 0xa700: + return IntelGpuSeriesType::kRaptorlake; default: break; } @@ -950,6 +952,7 @@ std::string GetIntelGpuGeneration(uint32_t vendor_id, uint32_t device_id) { case IntelGpuSeriesType::kDG1: case IntelGpuSeriesType::kAlderlake: case IntelGpuSeriesType::kAlchemist: + case IntelGpuSeriesType::kRaptorlake: return "12"; default: break; diff --git a/chromium/gpu/config/process_json.py b/chromium/gpu/config/process_json.py index b1e246beca7..dd51d933624 100755 --- a/chromium/gpu/config/process_json.py +++ b/chromium/gpu/config/process_json.py @@ -691,7 +691,8 @@ def write_intel_gpu_series_list(entry_id, is_exception, exception_id, 'rocketlake': 'kRocketlake', 'dg1': 'kDG1', 'alderlake': 'kAlderlake', - 'alchemist': 'kAlchemist' + 'alchemist': 'kAlchemist', + 'raptorlake': 'kRaptorlake' } for series in intel_gpu_series_list: assert series in intel_gpu_series_map -- cgit v1.2.3