intel: Add Cannonlake PCI IDs for U-skus.
PATCH 1/4 intel: Add Cannonlake PCI IDs for U-skus.
Platform enabling and its power-on are organized in different skus (U x Y x S x H, etc). So instead of organizing it in GT1 x GT2 x GT3 let's also use the platform sku.
This is a copy of merged i915's
commit e918d79a5d0a ("drm/i915/cnl: Add Cannonlake PCI IDs for U-skus.")
v2: Remove PCI IDs for SKU not mentioned in spec.
v3: Add kernel commit id for reference.
--- intel/intel_chipset.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
intel/intel_chipset.h +13 -0
@@ -233,6 +233,11 @@#define PCI_CHIP_COFFEELAKE_U_GT3_3 0x3EA7#define PCI_CHIP_COFFEELAKE_U_GT3_4 0x3EA8 +#define PCI_CHIP_CANNONLAKE_U_GT2_0 0x5A52 +#define PCI_CHIP_CANNONLAKE_U_GT2_1 0x5A5A +#define PCI_CHIP_CANNONLAKE_U_GT2_2 0x5A42 +#define PCI_CHIP_CANNONLAKE_U_GT2_3 0x5A4A +#define IS_MOBILE (devid) ((devid) == PCI_CHIP_I855_GM || \ (devid) == PCI_CHIP_I915_GM || \ (devid) == PCI_CHIP_I945_GM || \
@@ -496,5 +501,13 @@ IS_GEN8(dev) || \ IS_GEN9(dev)) +#define IS_CNL_U (devid) ((devid) == PCI_CHIP_CANNONLAKE_U_GT2_0 || \ + (devid) == PCI_CHIP_CANNONLAKE_U_GT2_1 || \ + (devid) == PCI_CHIP_CANNONLAKE_U_GT2_2 || \ + (devid) == PCI_CHIP_CANNONLAKE_U_GT2_3) + +#define IS_CANNONLAKE (devid) (IS_CNL_U(devid)) + +#define IS_GEN10 (devid) (IS_CANNONLAKE(devid))#endif /* _INTEL_CHIPSET_H */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/4 intel: Add Cannonlake PCI IDs for Y-skus.
By the Spec all CNL Y skus are 2+2, i.e. GT2.
This is a copy of merged i915's
commit 95578277cbdb ("drm/i915/cnl: Add Cannonlake PCI IDs for Y-skus.")
v2: Add kernel commit id for reference.
--- intel/intel_chipset.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
intel/intel_chipset.h +15 -1
@@ -237,6 +237,12 @@#define PCI_CHIP_CANNONLAKE_U_GT2_1 0x5A5A#define PCI_CHIP_CANNONLAKE_U_GT2_2 0x5A42#define PCI_CHIP_CANNONLAKE_U_GT2_3 0x5A4A +#define PCI_CHIP_CANNONLAKE_Y_GT2_0 0x5A51 +#define PCI_CHIP_CANNONLAKE_Y_GT2_1 0x5A59 +#define PCI_CHIP_CANNONLAKE_Y_GT2_2 0x5A41 +#define PCI_CHIP_CANNONLAKE_Y_GT2_3 0x5A49 +#define PCI_CHIP_CANNONLAKE_Y_GT2_4 0x5A71 +#define PCI_CHIP_CANNONLAKE_Y_GT2_5 0x5A79#define IS_MOBILE (devid) ((devid) == PCI_CHIP_I855_GM || \ (devid) == PCI_CHIP_I915_GM || \
@@ -501,12 +507,20 @@ IS_GEN8(dev) || \ IS_GEN9(dev)) +#define IS_CNL_Y (devid) ((devid) == PCI_CHIP_CANNONLAKE_Y_GT2_0 || \ + (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_1 || \ + (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_2 || \ + (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_3 || \ + (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_4 || \ + (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_5) +#define IS_CNL_U (devid) ((devid) == PCI_CHIP_CANNONLAKE_U_GT2_0 || \ (devid) == PCI_CHIP_CANNONLAKE_U_GT2_1 || \ (devid) == PCI_CHIP_CANNONLAKE_U_GT2_2 || \ (devid) == PCI_CHIP_CANNONLAKE_U_GT2_3) -#define IS_CANNONLAKE (devid) (IS_CNL_U(devid)) +#define IS_CANNONLAKE (devid) (IS_CNL_U(devid) || \ + IS_CNL_Y(devid))#define IS_GEN10 (devid) (IS_CANNONLAKE(devid))
Signature · 6 lines
1.9.1 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [PATCH 2/4] intel: Add Cannonlake PCI IDs for Y-skus.
-Clint
Quoted 43 lines · Rodrigo Vivi
By the Spec all CNL Y skus are 2+2, i.e. GT2.
This is a copy of merged i915's
commit95578277cbdb("drm/i915/cnl: Add Cannonlake PCI IDs for Y-skus.")v2: Add kernel commit id for reference.
Cc Anusha Srivatsa <[email protected]>Cc Clinton Taylor <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- intel/intel_chipset.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)intel/intel_chipset.h +13
-0@@ -237,6 +237,12 @@#define PCI_CHIP_CANNONLAKE_U_GT2_1 0x5A5A#define PCI_CHIP_CANNONLAKE_U_GT2_2 0x5A42#define PCI_CHIP_CANNONLAKE_U_GT2_3 0x5A4A +#define PCI_CHIP_CANNONLAKE_Y_GT2_0 0x5A51 +#define PCI_CHIP_CANNONLAKE_Y_GT2_1 0x5A59 +#define PCI_CHIP_CANNONLAKE_Y_GT2_2 0x5A41 +#define PCI_CHIP_CANNONLAKE_Y_GT2_3 0x5A49 +#define PCI_CHIP_CANNONLAKE_Y_GT2_4 0x5A71 +#define PCI_CHIP_CANNONLAKE_Y_GT2_5 0x5A79#define IS_MOBILE (devid) ((devid) == PCI_CHIP_I855_GM || \ (devid) == PCI_CHIP_I915_GM || \@@ -501,12 +507,20 @@ IS_GEN8(dev) || \ IS_GEN9(dev)) +#define IS_CNL_Y (devid) ((devid) == PCI_CHIP_CANNONLAKE_Y_GT2_0 || \ + (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_1 || \ + (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_2 || \ + (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_3 || \ + (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_4 || \ + (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_5) +#define IS_CNL_U (devid) ((devid) == PCI_CHIP_CANNONLAKE_U_GT2_0 || \
intel/intel_chipset.h line 526
Quoted 10 lines
intel/intel_chipset.h +2
-1(devid) == PCI_CHIP_CANNONLAKE_U_GT2_1 || \ (devid) == PCI_CHIP_CANNONLAKE_U_GT2_2 || \ (devid) == PCI_CHIP_CANNONLAKE_U_GT2_3) -#define IS_CANNONLAKE (devid) (IS_CNL_U(devid)) +#define IS_CANNONLAKE (devid) (IS_CNL_U(devid) || \ + IS_CNL_Y(devid))#define IS_GEN10 (devid) (IS_CANNONLAKE(devid))
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Mesa-dev] [PATCH 2/4] intel: Add Cannonlake PCI IDs for Y-skus.
series pushed to libdrm. Thanks for the review.
Quoted 72 lines · Clint Taylor
Reviewed-by Clinton Taylor <[email protected]>-Clint
Quoted 55 lines · Rodrigo Vivi
By the Spec all CNL Y skus are 2+2, i.e. GT2.
This is a copy of merged i915's
commit95578277cbdb("drm/i915/cnl: Add Cannonlake PCI IDs for Y-skus.")v2: Add kernel commit id for reference.
Cc Anusha Srivatsa <[email protected]>Cc Clinton Taylor <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- intel/intel_chipset.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)intel/intel_chipset.h +12
-0@@ -237,6 +237,12 @@#define PCI_CHIP_CANNONLAKE_U_GT2_1 0x5A5A#define PCI_CHIP_CANNONLAKE_U_GT2_2 0x5A42#define PCI_CHIP_CANNONLAKE_U_GT2_3 0x5A4A +#define PCI_CHIP_CANNONLAKE_Y_GT2_0 0x5A51 +#define PCI_CHIP_CANNONLAKE_Y_GT2_1 0x5A59 +#define PCI_CHIP_CANNONLAKE_Y_GT2_2 0x5A41 +#define PCI_CHIP_CANNONLAKE_Y_GT2_3 0x5A49 +#define PCI_CHIP_CANNONLAKE_Y_GT2_4 0x5A71 +#define PCI_CHIP_CANNONLAKE_Y_GT2_5 0x5A79#define IS_MOBILE (devid) ((devid) == PCI_CHIP_I855_GM || \ (devid) == PCI_CHIP_I915_GM || \@@ -501,12 +507,20 @@IS_GEN8 (dev) || \ IS_GEN9(dev)) +#define IS_CNL_Y(devid) ((devid) ==PCI_CHIP_CANNONLAKE_Y_GT2_0 || \ + (devid) ==PCI_CHIP_CANNONLAKE_Y_GT2_1 || \ + (devid) ==PCI_CHIP_CANNONLAKE_Y_GT2_2 || \ + (devid) ==PCI_CHIP_CANNONLAKE_Y_GT2_3 || \ + (devid) ==PCI_CHIP_CANNONLAKE_Y_GT2_4 || \ + (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_5) +#define IS_CNL_U (devid) ((devid) ==PCI_CHIP_CANNONLAKE_U_GT2_0 || \ (devid) ==PCI_CHIP_CANNONLAKE_U_GT2_1 || \ (devid) == PCI_CHIP_CANNONLAKE_U_GT2_2 ||\ (devid) == PCI_CHIP_CANNONLAKE_U_GT2_3)-#define
IS_CANNONLAKE(devid)(IS_CNL_U(devid))intel/intel_chipset.h line 525
Quoted 3 lines
intel/intel_chipset.h +2
-0+#define IS_CANNONLAKE (devid) (IS_CNL_U(devid) || \ + IS_CNL_Y(devid))#define IS_GEN10 (devid) (IS_CANNONLAKE(devid))_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/4 intel/gen10: Add missed gen10 stuff
In reply to Rodrigo ViviFrom: Ben Widawsky <[email protected]>
This got lost on rebase, I believe
--- intel/intel_bufmgr_gem.c | 2 ++ intel/intel_decode.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)
intel/intel_bufmgr_gem.c +2 -0
@@ -3662,6 +3662,8 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size) bufmgr_gem->gen =8 ; else if (IS_GEN9(bufmgr_gem->pci_device)) bufmgr_gem->gen = 9; + else if (IS_GEN10(bufmgr_gem->pci_device)) + bufmgr_gem->gen = 10; else {free (bufmgr_gem); bufmgr_gem =NULL ;
intel/intel_decode.c +3 -1
@@ -3827,7 +3827,9 @@ drm_intel_decode_context_alloc(uint32_t devid) ctx->devid = devid; ctx->out = stdout; -if (IS_GEN9 (devid)) +if (IS_GEN10 (devid)) + ctx->gen =10 ; +else if (IS_GEN9 (devid)) ctx->gen =9 ;else if (IS_GEN8 (devid)) ctx->gen =8 ;
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 4/4 intel: add GEN10 to IS_9XX.
In reply to Rodrigo ViviFrom: Paulo Zanoni <[email protected]>
As far as I understand, IS_9XX should return true for it.
--- intel/intel_chipset.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
intel/intel_chipset.h +2 -1
@@ -505,7 +505,8 @@ IS_GEN6(dev) || \ IS_GEN7(dev) || \ IS_GEN8(dev) || \ - IS_GEN9(dev)) + IS_GEN9(dev) || \ + IS_GEN10(dev))#define IS_CNL_Y (devid) ((devid) == PCI_CHIP_CANNONLAKE_Y_GT2_0 || \ (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_1 || \
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
-Clint
Quoted 37 lines · Rodrigo Vivi
Platform enabling and its power-on are organized in different skus (U x Y x S x H, etc). So instead of organizing it in GT1 x GT2 x GT3 let's also use the platform sku.
This is a copy of merged i915's
commite918d79a5d0a("drm/i915/cnl: Add Cannonlake PCI IDs for U-skus.")v2: Remove PCI IDs for SKU not mentioned in spec.
v3: Add kernel commit id for reference.Cc Anusha Srivatsa <[email protected]>Cc Clinton Taylor <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- intel/intel_chipset.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)intel/intel_chipset.h +5
-0@@ -233,6 +233,11 @@#define PCI_CHIP_COFFEELAKE_U_GT3_3 0x3EA7#define PCI_CHIP_COFFEELAKE_U_GT3_4 0x3EA8 +#define PCI_CHIP_CANNONLAKE_U_GT2_0 0x5A52 +#define PCI_CHIP_CANNONLAKE_U_GT2_1 0x5A5A +#define PCI_CHIP_CANNONLAKE_U_GT2_2 0x5A42 +#define PCI_CHIP_CANNONLAKE_U_GT2_3 0x5A4A +#define IS_MOBILE (devid) ((devid) == PCI_CHIP_I855_GM || \ (devid) == PCI_CHIP_I915_GM || \ (devid) == PCI_CHIP_I945_GM || \@@ -496,5 +501,13 @@IS_GEN8 (dev) || \ IS_GEN9(dev))
intel/intel_chipset.h line 513
Quoted 10 lines
intel/intel_chipset.h +8
-0+#define IS_CNL_U (devid) ((devid) == PCI_CHIP_CANNONLAKE_U_GT2_0 || \ + (devid) == PCI_CHIP_CANNONLAKE_U_GT2_1 || \ + (devid) == PCI_CHIP_CANNONLAKE_U_GT2_2 || \ + (devid) == PCI_CHIP_CANNONLAKE_U_GT2_3) + +#define IS_CANNONLAKE (devid) (IS_CNL_U(devid)) + +#define IS_GEN10 (devid) (IS_CANNONLAKE(devid))#endif /* _INTEL_CHIPSET_H */
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel