Mesa (staging/21.2): intel/dev: Add display_ver and set adl-p to 13

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: b04d75a6511f92b991bf25bc7b4ba559b1a59f7b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b04d75a6511f92b991bf25bc7b4ba559b1a59f7b

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Thu Sep 16 15:39:11 2021 -0700

intel/dev: Add display_ver and set adl-p to 13

Ref: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12908
Cc: mesa-stable
Fixes: e435511b580 ("intel/dev: Add device info for ADL GT2")
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12973>
(cherry picked from commit c746bf4c5c811d7d5614ca13504e6412ac13e911)

Conflicts:
	src/intel/dev/intel_device_info.c

---

 .pick_status.json                 | 2 +-
 src/intel/dev/intel_device_info.c | 4 ++++
 src/intel/dev/intel_device_info.h | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 7ace7b4d6e2..cc992b5b51c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -40,7 +40,7 @@
         "description": "intel/dev: Add display_ver and set adl-p to 13",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "e435511b580287d1fab1b1028b2d36acce80dac9"
     },
diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index 1bf31494536..216c52cbe23 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -992,6 +992,7 @@ static const struct intel_device_info intel_device_info_adl_gt1 = {
 static const struct intel_device_info intel_device_info_adl_gt2 = {
    GFX12_GT_FEATURES(2),
    .is_alderlake = true,
+   .display_ver = 13,
 };
 
 #define GFX12_DG1_FEATURES                      \
@@ -1287,6 +1288,9 @@ intel_get_device_info_from_pci_id(int pci_id,
    if (devinfo->verx10 == 0)
       devinfo->verx10 = devinfo->ver * 10;
 
+   if (devinfo->display_ver == 0)
+      devinfo->display_ver = devinfo->ver;
+
    devinfo->chipset_id = pci_id;
    return true;
 }
diff --git a/src/intel/dev/intel_device_info.h b/src/intel/dev/intel_device_info.h
index ebb779e3938..5e28305f7c9 100644
--- a/src/intel/dev/intel_device_info.h
+++ b/src/intel/dev/intel_device_info.h
@@ -49,6 +49,7 @@ struct intel_device_info
    /* Driver internal numbers used to differentiate platforms. */
    int ver;
    int verx10;
+   int display_ver;
    int revision;
    int gt;