Change in libgfxinit[master]: gma config: Add Comet Lake PCI IDs

[Nico Huber (Code Review)]

Hello Angel Pons, Arthur Heymans, Matt DeVillier,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/libgfxinit/+/36443

to review the following change.

Change subject: gma config: Add Comet Lake PCI IDs
......................................................................

gma config: Add Comet Lake PCI IDs

Comet Lake is still treated like Kaby Lake :)

Change-Id: I543f1a50c204d963de80111aa0afd724e4093c4a
Signed-off-by: Nico Huber 
---
M common/hw-gfx-gma-config.ads.template
1 file changed, 15 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/43/36443/1

diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template
index 0e49943..7347341 100644
--- a/common/hw-gfx-gma-config.ads.template
+++ b/common/hw-gfx-gma-config.ads.template
@@ -428,6 +428,17 @@
    function Is_Coffee_Lake (Device_Id : Word16) return Boolean is
      ((Device_Id and 16#fff0#) = 16#3e90#);

+   function Is_Comet_Lake_U (Device_Id : Word16) return Boolean is
+     ((Device_Id and 16#ff9f#) = 16#9b01# or
+      (Device_Id and 16#ff9f#) = 16#9b8a# or
+      (Device_Id and 16#ff9f#) = 16#9b8c#);
+   function Is_Comet_Lake (Device_Id : Word16) return Boolean is
+     ((Device_Id and 16#ff8f#) = 16#9b82# or
+      (Device_Id and 16#ff8f#) = 16#9b84# or
+      (Device_Id and 16#ff8f#) = 16#9b85# or
+      (Device_Id and 16#ff8f#) = 16#9b86# or
+      (Device_Id and 16#ff8f#) = 16#9b88#);
+
    function Is_GPU (Device_Id : Word16; CPU : CPU_Type; CPU_Var : CPU_Variant)
       return Boolean is
      (case CPU is
@@ -452,10 +463,12 @@
          when Kabylake     => (case CPU_Var is
                                  when Normal =>
                                     Is_Kaby_Lake (Device_Id) or
-                                    Is_Coffee_Lake (Device_Id),
+                                    Is_Coffee_Lake (Device_Id) or
+                                    Is_Comet_Lake (Device_Id),
                                  when ULT    =>
                                     Is_Kaby_Lake_U (Device_Id) or
-                                    Is_Coffee_Lake_U (Device_Id),
+                                    Is_Coffee_Lake_U (Device_Id) or
+                                    Is_Comet_Lake_U (Device_Id),
                                  when ULX    =>
                                     Is_Kaby_Lake_Y (Device_Id) or
                                     Is_Kaby_Lake_Y_AML (Device_Id) or

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/libgfxinit/+/36443 )

Change subject: gma config: Add Comet Lake PCI IDs
......................................................................

Patch Set 1: Code-Review+1

Any tests done on actual cursed sand?

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/libgfxinit/+/36443 )

Change subject: gma config: Add Comet Lake PCI IDs
......................................................................

Patch Set 1:
> Any tests done on actual cursed sand?

Nope.

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/libgfxinit/+/36443 )

Change subject: gma config: Add Comet Lake PCI IDs
......................................................................

Patch Set 1: Code-Review+2
> Patch Set 1:
> > Any tests done on actual cursed sand?
>
> Nope.

Ack, I'll give a +2 for Code-Review, so it just depends on the Verified score.

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/libgfxinit/+/36443 )

Change subject: gma config: Add Comet Lake PCI IDs
......................................................................

gma config: Add Comet Lake PCI IDs

Comet Lake is still treated like Kaby Lake :)

Change-Id: I543f1a50c204d963de80111aa0afd724e4093c4a
Signed-off-by: Nico Huber 
Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/36443
Reviewed-by: Angel Pons 
---
M common/hw-gfx-gma-config.ads.template
1 file changed, 15 insertions(+), 2 deletions(-)

Approvals:
  Nico Huber: Verified
  Angel Pons: Looks good to me, approved

diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template
index 8cd3cff..b9ba9f8 100644
--- a/common/hw-gfx-gma-config.ads.template
+++ b/common/hw-gfx-gma-config.ads.template
@@ -430,6 +430,17 @@
    function Is_Coffee_Lake (Device_Id : Word16) return Boolean is
      ((Device_Id and 16#fff0#) = 16#3e90#);

+   function Is_Comet_Lake_U (Device_Id : Word16) return Boolean is
+     ((Device_Id and 16#ff9f#) = 16#9b01# or
+      (Device_Id and 16#ff9f#) = 16#9b8a# or
+      (Device_Id and 16#ff9f#) = 16#9b8c#);
+   function Is_Comet_Lake (Device_Id : Word16) return Boolean is
+     ((Device_Id and 16#ff8f#) = 16#9b82# or
+      (Device_Id and 16#ff8f#) = 16#9b84# or
+      (Device_Id and 16#ff8f#) = 16#9b85# or
+      (Device_Id and 16#ff8f#) = 16#9b86# or
+      (Device_Id and 16#ff8f#) = 16#9b88#);
+
    function Is_GPU (Device_Id : Word16; CPU : CPU_Type; CPU_Var : CPU_Variant)
       return Boolean is
      (case CPU is
@@ -454,10 +465,12 @@
          when Kabylake     => (case CPU_Var is
                                  when Normal =>
                                     Is_Kaby_Lake (Device_Id) or
-                                    Is_Coffee_Lake (Device_Id),
+                                    Is_Coffee_Lake (Device_Id) or
+                                    Is_Comet_Lake (Device_Id),
                                  when ULT    =>
                                     Is_Kaby_Lake_U (Device_Id) or
-                                    Is_Coffee_Lake_U (Device_Id),
+                                    Is_Coffee_Lake_U (Device_Id) or
+                                    Is_Comet_Lake_U (Device_Id),
                                  when ULX    =>
                                     Is_Kaby_Lake_Y (Device_Id) or
                                     Is_Kaby_Lake_Y_AML (Device_Id) or