lib/kbl: move KBL check from IS_SKYLAKE() to IS_GEN9()
PATCH 1/2 lib/kbl: move KBL check from IS_SKYLAKE() to IS_GEN9()
Remove the KBL check from IS_SKYLAKE() following the kernel definition. Then, add the KBL check to IS_GEN9().
The idea is to avoid confusion. On the kernel side, the mix of SKY and KBL was nacked so the platforms are split.
Signed-off-by Wayne Boyer <[email protected]>
--- lib/intel_chipset.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
lib/intel_chipset.h +4 -3
@@ -434,8 +434,7 @@ void intel_check_pch(void); IS_KBL_GT2(devid) || \ IS_KBL_GT3(devid)) -#define IS_SKYLAKE (devid) (IS_KABYLAKE(devid) || \ - IS_SKL_GT1(devid) || \ +#define IS_SKYLAKE (devid) (IS_SKL_GT1(devid) || \ IS_SKL_GT2(devid) || \ IS_SKL_GT3(devid))
@@ -443,7 +442,9 @@ void intel_check_pch(void); (devid) == PCI_CHIP_BROXTON_1 || \ (devid) == PCI_CHIP_BROXTON_2) -#define IS_GEN9 (devid) (IS_SKYLAKE(devid) || IS_BROXTON(devid)) +#define IS_GEN9 (devid) (IS_KABYLAKE(devid) || \ + IS_SKYLAKE(devid) || \ + IS_BROXTON(devid))#define IS_965 (devid) (IS_GEN4(devid) || \ IS_GEN5(devid) || \
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 lib/kbl: Add Kabylake GT4 PCI IDs
Add the Kabylake GT4 PCI IDs as defined in this kernel patch.
commit 8b10c0cf21ec84618d4bf02c73c0543500ece68d
Author: Deepak S <[email protected]>
Date: Wed Oct 28 12:21:12 2015 -0700
drm/i915/kbl: Add Kabylake GT4 PCI ID
Signed-off-by Wayne Boyer <[email protected]>
--- lib/intel_chipset.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
lib/intel_chipset.h +11 -1
@@ -217,13 +217,17 @@ void intel_check_pch(void);#define PCI_CHIP_KABYLAKE_DT_GT2 0x5912#define PCI_CHIP_KABYLAKE_DT_GT1_5 0x5917#define PCI_CHIP_KABYLAKE_DT_GT1 0x5902 +#define PCI_CHIP_KABYLAKE_DT_GT4 0x5932#define PCI_CHIP_KABYLAKE_HALO_GT2 0x591B#define PCI_CHIP_KABYLAKE_HALO_GT3 0x592B#define PCI_CHIP_KABYLAKE_HALO_GT1 0x590B +#define PCI_CHIP_KABYLAKE_HALO_GT4 0x593B#define PCI_CHIP_KABYLAKE_SRV_GT2 0x591A#define PCI_CHIP_KABYLAKE_SRV_GT3 0x592A +#define PCI_CHIP_KABYLAKE_SRV_GT4 0x593A#define PCI_CHIP_KABYLAKE_SRV_GT1 0x590A#define PCI_CHIP_KABYLAKE_WKS_GT2 0x591D +#define PCI_CHIP_KABYLAKE_WKS_GT4 0x593D#define PCI_CHIP_BROXTON_0 0x0A84#define PCI_CHIP_BROXTON_1 0x1A84
@@ -430,9 +434,15 @@ void intel_check_pch(void); (devid) == PCI_CHIP_KABYLAKE_HALO_GT3|| \ (devid) == PCI_CHIP_KABYLAKE_SRV_GT3) +#define IS_KBL_GT4 (devid) ((devid) == PCI_CHIP_KABYLAKE_DT_GT4|| \ + (devid) == PCI_CHIP_KABYLAKE_HALO_GT4|| \ + (devid) == PCI_CHIP_KABYLAKE_SRV_GT4|| \ + (devid) == PCI_CHIP_KABYLAKE_WKS_GT4) +#define IS_KABYLAKE (devid) (IS_KBL_GT1(devid) || \ IS_KBL_GT2(devid) || \ - IS_KBL_GT3(devid)) + IS_KBL_GT3(devid) || \ + IS_KBL_GT4(devid))#define IS_SKYLAKE (devid) (IS_SKL_GT1(devid) || \ IS_SKL_GT2(devid) || \
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx