From 633ebd0c22729f190fa45f7440987552d51373fb Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 27 Oct 2022 13:07:02 -0400 Subject: [PATCH] intel/dev: Set display_ver = 13 on all ADL/RPL/DG2 display_ver doesn't seem to be used anywhere, but if that were to change, we'd want this to be consistent. Fixes: c746bf4c5c8 ("intel/dev: Add display_ver and set adl-p to 13") Part-of: (cherry picked from commit 3ef88cd0a2de26e56def43db969f98c80235f065) --- .pick_status.json | 2 +- src/intel/dev/intel_device_info.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 7eefcc7e524..4b2c53a418d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2128,7 +2128,7 @@ "description": "intel/dev: Set display_ver = 13 on all ADL/RPL/DG2", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c746bf4c5c811d7d5614ca13504e6412ac13e911" }, diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c index baf68d4acf1..3a07fd700a0 100644 --- a/src/intel/dev/intel_device_info.c +++ b/src/intel/dev/intel_device_info.c @@ -1007,11 +1007,13 @@ static const struct intel_device_info intel_device_info_rkl_gt1 = { static const struct intel_device_info intel_device_info_adl_gt05 = { GFX12_GT05_FEATURES, .platform = INTEL_PLATFORM_ADL, + .display_ver = 13, }; static const struct intel_device_info intel_device_info_adl_gt1 = { GFX12_GT_FEATURES(1), .platform = INTEL_PLATFORM_ADL, + .display_ver = 13, }; static const struct intel_device_info intel_device_info_adl_n = { @@ -1030,6 +1032,7 @@ static const struct intel_device_info intel_device_info_rpl = { GFX12_FEATURES(1, 1, 4), .num_subslices = dual_subslices(2), .platform = INTEL_PLATFORM_RPL, + .display_ver = 13, }; static const struct intel_device_info intel_device_info_rpl_p = { @@ -1067,6 +1070,7 @@ static const struct intel_device_info intel_device_info_sg1 = { #define DG2_FEATURES \ /* (Sub)slice info comes from the kernel topology info */ \ XEHP_FEATURES(0, 1, 0), \ + .display_ver = 13, \ .revision = 4, /* For offline compiler */ \ .num_subslices = dual_subslices(1), \ .has_lsc = true, \