* [PATCH v2 0/3] drm/i915: add perf support for Coffeelake
@ 2017-08-29 17:46 Lionel Landwerlin
2017-08-29 17:46 ` [PATCH v2 1/3] drm/i915: add GT number to intel_device_info Lionel Landwerlin
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Lionel Landwerlin @ 2017-08-29 17:46 UTC (permalink / raw)
To: intel-gfx
Upon Chris' comment, fill the intel_device_info.gt field for SNB & IVB
as well.
Cheers,
Lionel Landwerlin (3):
drm/i915: add GT number to intel_device_info
drm/i915: rework IS_*_GT* macros
drm/i915/perf: add support for Coffeelake GT2
drivers/gpu/drm/i915/Makefile | 3 +-
drivers/gpu/drm/i915/i915_drv.h | 22 ++--
drivers/gpu/drm/i915/i915_oa_cflgt2.c | 109 +++++++++++++++++++
drivers/gpu/drm/i915/i915_oa_cflgt2.h | 34 ++++++
drivers/gpu/drm/i915/i915_pci.c | 193 ++++++++++++++++++++++++++--------
drivers/gpu/drm/i915/i915_perf.c | 5 +
include/drm/i915_pciids.h | 138 ++++++++++++++----------
7 files changed, 392 insertions(+), 112 deletions(-)
create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt2.c
create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt2.h
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/3] drm/i915: add GT number to intel_device_info
2017-08-29 17:46 [PATCH v2 0/3] drm/i915: add perf support for Coffeelake Lionel Landwerlin
@ 2017-08-29 17:46 ` Lionel Landwerlin
2017-08-29 17:46 ` [PATCH v2 2/3] drm/i915: rework IS_*_GT* macros Lionel Landwerlin
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Lionel Landwerlin @ 2017-08-29 17:46 UTC (permalink / raw)
To: intel-gfx
Up to Coffeelake we could deduce this GT number from the device ID.
This doesn't seem to be the case anymore. This change reorders pciids
per GT and adds a gt field to intel_device_info. We set this field on
the following platforms :
- SNB/IVB/HSW/BDW/SKL/KBL/CFL/CNL
v2: Add SNB & IVB (Chris)
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/i915_pci.c | 193 +++++++++++++++++++++++++++++++---------
include/drm/i915_pciids.h | 138 ++++++++++++++++------------
3 files changed, 231 insertions(+), 101 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 0383e879a315..3d417537bd59 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -842,6 +842,7 @@ struct intel_device_info {
u8 gen;
u16 gen_mask;
enum intel_platform platform;
+ u8 gt; /* GT number, 0 if undefined */
u8 ring_mask; /* Rings supported by the HW */
u8 num_rings;
#define DEFINE_FLAG(name) u8 name:1
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index a1e6b696bcfa..0ac733baa734 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -224,15 +224,34 @@ static const struct intel_device_info intel_ironlake_m_info = {
GEN_DEFAULT_PIPEOFFSETS, \
CURSOR_OFFSETS
-static const struct intel_device_info intel_sandybridge_d_info = {
- GEN6_FEATURES,
- .platform = INTEL_SANDYBRIDGE,
+#define SNB_D_PLATFORM \
+ GEN6_FEATURES, \
+ .platform = INTEL_SANDYBRIDGE
+
+static const struct intel_device_info intel_sandybridge_d_gt1_info = {
+ SNB_D_PLATFORM,
+ .gt = 1,
};
-static const struct intel_device_info intel_sandybridge_m_info = {
- GEN6_FEATURES,
- .platform = INTEL_SANDYBRIDGE,
- .is_mobile = 1,
+static const struct intel_device_info intel_sandybridge_d_gt2_info = {
+ SNB_D_PLATFORM,
+ .gt = 2,
+};
+
+#define SNB_M_PLATFORM \
+ GEN6_FEATURES, \
+ .platform = INTEL_SANDYBRIDGE, \
+ .is_mobile = 1
+
+
+static const struct intel_device_info intel_sandybridge_m_gt1_info = {
+ SNB_M_PLATFORM,
+ .gt = 1,
+};
+
+static const struct intel_device_info intel_sandybridge_m_gt2_info = {
+ SNB_M_PLATFORM,
+ .gt = 2,
};
#define GEN7_FEATURES \
@@ -249,22 +268,41 @@ static const struct intel_device_info intel_sandybridge_m_info = {
GEN_DEFAULT_PIPEOFFSETS, \
IVB_CURSOR_OFFSETS
-static const struct intel_device_info intel_ivybridge_d_info = {
- GEN7_FEATURES,
- .platform = INTEL_IVYBRIDGE,
- .has_l3_dpf = 1,
+#define IVB_D_FEATURES \
+ GEN7_FEATURES, \
+ .platform = INTEL_IVYBRIDGE, \
+ .has_l3_dpf = 1
+
+static const struct intel_device_info intel_ivybridge_d_gt1_info = {
+ IVB_D_FEATURES,
+ .gt = 1,
};
-static const struct intel_device_info intel_ivybridge_m_info = {
- GEN7_FEATURES,
- .platform = INTEL_IVYBRIDGE,
- .is_mobile = 1,
- .has_l3_dpf = 1,
+static const struct intel_device_info intel_ivybridge_d_gt2_info = {
+ IVB_D_FEATURES,
+ .gt = 2,
+};
+
+#define IVB_M_FEATURES \
+ GEN7_FEATURES, \
+ .platform = INTEL_IVYBRIDGE, \
+ .is_mobile = 1, \
+ .has_l3_dpf = 1
+
+static const struct intel_device_info intel_ivybridge_m_gt1_info = {
+ IVB_M_FEATURES,
+ .gt = 1,
+};
+
+static const struct intel_device_info intel_ivybridge_m_gt2_info = {
+ IVB_M_FEATURES,
+ .gt = 2,
};
static const struct intel_device_info intel_ivybridge_q_info = {
GEN7_FEATURES,
.platform = INTEL_IVYBRIDGE,
+ .gt = 2,
.num_pipes = 0, /* legal, last one wins */
.has_l3_dpf = 1,
};
@@ -299,10 +337,24 @@ static const struct intel_device_info intel_valleyview_info = {
.has_rc6p = 0 /* RC6p removed-by HSW */, \
.has_runtime_pm = 1
-static const struct intel_device_info intel_haswell_info = {
- HSW_FEATURES,
- .platform = INTEL_HASWELL,
- .has_l3_dpf = 1,
+#define HSW_PLATFORM \
+ HSW_FEATURES, \
+ .platform = INTEL_HASWELL, \
+ .has_l3_dpf = 1
+
+static const struct intel_device_info intel_haswell_gt1_info = {
+ HSW_PLATFORM,
+ .gt = 1,
+};
+
+static const struct intel_device_info intel_haswell_gt2_info = {
+ HSW_PLATFORM,
+ .gt = 2,
+};
+
+static const struct intel_device_info intel_haswell_gt3_info = {
+ HSW_PLATFORM,
+ .gt = 3,
};
#define BDW_FEATURES \
@@ -318,12 +370,27 @@ static const struct intel_device_info intel_haswell_info = {
.gen = 8, \
.platform = INTEL_BROADWELL
-static const struct intel_device_info intel_broadwell_info = {
+static const struct intel_device_info intel_broadwell_gt1_info = {
+ BDW_PLATFORM,
+ .gt = 1,
+};
+
+static const struct intel_device_info intel_broadwell_gt2_info = {
BDW_PLATFORM,
+ .gt = 2,
+};
+
+static const struct intel_device_info intel_broadwell_rsvd_info = {
+ BDW_PLATFORM,
+ .gt = 3,
+ /* According to the device ID those devices are GT3, they were
+ * previously treated as not GT3, keep it like that.
+ */
};
static const struct intel_device_info intel_broadwell_gt3_info = {
BDW_PLATFORM,
+ .gt = 3,
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
};
@@ -358,13 +425,29 @@ static const struct intel_device_info intel_cherryview_info = {
.has_guc = 1, \
.ddb_size = 896
-static const struct intel_device_info intel_skylake_info = {
+static const struct intel_device_info intel_skylake_gt1_info = {
SKL_PLATFORM,
+ .gt = 1,
};
-static const struct intel_device_info intel_skylake_gt3_info = {
+static const struct intel_device_info intel_skylake_gt2_info = {
SKL_PLATFORM,
- .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
+ .gt = 2,
+};
+
+#define SKL_GT3_PLUS_PLATFORM \
+ SKL_PLATFORM, \
+ .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING
+
+
+static const struct intel_device_info intel_skylake_gt3_info = {
+ SKL_GT3_PLUS_PLATFORM,
+ .gt = 3,
+};
+
+static const struct intel_device_info intel_skylake_gt4_info = {
+ SKL_GT3_PLUS_PLATFORM,
+ .gt = 4,
};
#define GEN9_LP_FEATURES \
@@ -415,12 +498,19 @@ static const struct intel_device_info intel_geminilake_info = {
.has_guc = 1, \
.ddb_size = 896
-static const struct intel_device_info intel_kabylake_info = {
+static const struct intel_device_info intel_kabylake_gt1_info = {
KBL_PLATFORM,
+ .gt = 1,
+};
+
+static const struct intel_device_info intel_kabylake_gt2_info = {
+ KBL_PLATFORM,
+ .gt = 2,
};
static const struct intel_device_info intel_kabylake_gt3_info = {
KBL_PLATFORM,
+ .gt = 3,
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
};
@@ -433,20 +523,28 @@ static const struct intel_device_info intel_kabylake_gt3_info = {
.has_guc = 1, \
.ddb_size = 896
-static const struct intel_device_info intel_coffeelake_info = {
+static const struct intel_device_info intel_coffeelake_gt1_info = {
+ CFL_PLATFORM,
+ .gt = 1,
+};
+
+static const struct intel_device_info intel_coffeelake_gt2_info = {
CFL_PLATFORM,
+ .gt = 2,
};
static const struct intel_device_info intel_coffeelake_gt3_info = {
CFL_PLATFORM,
+ .gt = 3,
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
};
-static const struct intel_device_info intel_cannonlake_info = {
+static const struct intel_device_info intel_cannonlake_gt2_info = {
BDW_FEATURES,
.is_alpha_support = 1,
.platform = INTEL_CANNONLAKE,
.gen = 10,
+ .gt = 2,
.ddb_size = 1024,
.has_csr = 1,
.color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }
@@ -475,31 +573,40 @@ static const struct pci_device_id pciidlist[] = {
INTEL_PINEVIEW_IDS(&intel_pineview_info),
INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),
INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),
- INTEL_SNB_D_IDS(&intel_sandybridge_d_info),
- INTEL_SNB_M_IDS(&intel_sandybridge_m_info),
+ INTEL_SNB_D_GT1_IDS(&intel_sandybridge_d_gt1_info),
+ INTEL_SNB_D_GT2_IDS(&intel_sandybridge_d_gt2_info),
+ INTEL_SNB_M_GT1_IDS(&intel_sandybridge_m_gt1_info),
+ INTEL_SNB_M_GT2_IDS(&intel_sandybridge_m_gt2_info),
INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */
- INTEL_IVB_M_IDS(&intel_ivybridge_m_info),
- INTEL_IVB_D_IDS(&intel_ivybridge_d_info),
- INTEL_HSW_IDS(&intel_haswell_info),
+ INTEL_IVB_M_GT1_IDS(&intel_ivybridge_m_gt1_info),
+ INTEL_IVB_M_GT2_IDS(&intel_ivybridge_m_gt2_info),
+ INTEL_IVB_D_GT1_IDS(&intel_ivybridge_d_gt1_info),
+ INTEL_IVB_D_GT2_IDS(&intel_ivybridge_d_gt2_info),
+ INTEL_HSW_GT1_IDS(&intel_haswell_gt1_info),
+ INTEL_HSW_GT2_IDS(&intel_haswell_gt2_info),
+ INTEL_HSW_GT3_IDS(&intel_haswell_gt3_info),
INTEL_VLV_IDS(&intel_valleyview_info),
- INTEL_BDW_GT12_IDS(&intel_broadwell_info),
+ INTEL_BDW_GT1_IDS(&intel_broadwell_gt1_info),
+ INTEL_BDW_GT2_IDS(&intel_broadwell_gt2_info),
INTEL_BDW_GT3_IDS(&intel_broadwell_gt3_info),
- INTEL_BDW_RSVD_IDS(&intel_broadwell_info),
+ INTEL_BDW_RSVD_IDS(&intel_broadwell_rsvd_info),
INTEL_CHV_IDS(&intel_cherryview_info),
- INTEL_SKL_GT1_IDS(&intel_skylake_info),
- INTEL_SKL_GT2_IDS(&intel_skylake_info),
+ INTEL_SKL_GT1_IDS(&intel_skylake_gt1_info),
+ INTEL_SKL_GT2_IDS(&intel_skylake_gt2_info),
INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),
- INTEL_SKL_GT4_IDS(&intel_skylake_gt3_info),
+ INTEL_SKL_GT4_IDS(&intel_skylake_gt4_info),
INTEL_BXT_IDS(&intel_broxton_info),
INTEL_GLK_IDS(&intel_geminilake_info),
- INTEL_KBL_GT1_IDS(&intel_kabylake_info),
- INTEL_KBL_GT2_IDS(&intel_kabylake_info),
+ INTEL_KBL_GT1_IDS(&intel_kabylake_gt1_info),
+ INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info),
INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
- INTEL_CFL_S_IDS(&intel_coffeelake_info),
- INTEL_CFL_H_IDS(&intel_coffeelake_info),
- INTEL_CFL_U_IDS(&intel_coffeelake_gt3_info),
- INTEL_CNL_IDS(&intel_cannonlake_info),
+ INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info),
+ INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info),
+ INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
+ INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
+ INTEL_CNL_U_GT2_IDS(&intel_cannonlake_gt2_info),
+ INTEL_CNL_Y_GT2_IDS(&intel_cannonlake_gt2_info),
{0, 0, 0}
};
MODULE_DEVICE_TABLE(pci, pciidlist);
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 34c8f5600ce0..b4c63e64da60 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -118,92 +118,109 @@
#define INTEL_IRONLAKE_M_IDS(info) \
INTEL_VGA_DEVICE(0x0046, info)
-#define INTEL_SNB_D_IDS(info) \
+#define INTEL_SNB_D_GT1_IDS(info) \
INTEL_VGA_DEVICE(0x0102, info), \
- INTEL_VGA_DEVICE(0x0112, info), \
- INTEL_VGA_DEVICE(0x0122, info), \
INTEL_VGA_DEVICE(0x010A, info)
-#define INTEL_SNB_M_IDS(info) \
- INTEL_VGA_DEVICE(0x0106, info), \
+#define INTEL_SNB_D_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x0112, info), \
+ INTEL_VGA_DEVICE(0x0122, info)
+
+#define INTEL_SNB_M_GT1_IDS(info) \
+ INTEL_VGA_DEVICE(0x0106, info)
+
+#define INTEL_SNB_M_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x0116, info), \
INTEL_VGA_DEVICE(0x0126, info)
-#define INTEL_IVB_M_IDS(info) \
- INTEL_VGA_DEVICE(0x0156, info), /* GT1 mobile */ \
- INTEL_VGA_DEVICE(0x0166, info) /* GT2 mobile */
+#define INTEL_IVB_M_GT1_IDS(info) \
+ INTEL_VGA_DEVICE(0x0156, info) /* GT1 mobile */
+
+#define INTEL_IVB_M_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x0166, info) /* GT2 mobile */
-#define INTEL_IVB_D_IDS(info) \
+#define INTEL_IVB_D_GT1_IDS(info) \
INTEL_VGA_DEVICE(0x0152, info), /* GT1 desktop */ \
+ INTEL_VGA_DEVICE(0x015a, info) /* GT1 server */
+
+#define INTEL_IVB_D_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x0162, info), /* GT2 desktop */ \
- INTEL_VGA_DEVICE(0x015a, info), /* GT1 server */ \
INTEL_VGA_DEVICE(0x016a, info) /* GT2 server */
#define INTEL_IVB_Q_IDS(info) \
INTEL_QUANTA_VGA_DEVICE(info) /* Quanta transcode */
-#define INTEL_HSW_IDS(info) \
+#define INTEL_HSW_GT1_IDS(info) \
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
- INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \
- INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
- INTEL_VGA_DEVICE(0x041a, info), /* GT2 server */ \
- INTEL_VGA_DEVICE(0x042a, info), /* GT3 server */ \
INTEL_VGA_DEVICE(0x040B, info), /* GT1 reserved */ \
- INTEL_VGA_DEVICE(0x041B, info), /* GT2 reserved */ \
- INTEL_VGA_DEVICE(0x042B, info), /* GT3 reserved */ \
INTEL_VGA_DEVICE(0x040E, info), /* GT1 reserved */ \
- INTEL_VGA_DEVICE(0x041E, info), /* GT2 reserved */ \
- INTEL_VGA_DEVICE(0x042E, info), /* GT3 reserved */ \
INTEL_VGA_DEVICE(0x0C02, info), /* SDV GT1 desktop */ \
- INTEL_VGA_DEVICE(0x0C12, info), /* SDV GT2 desktop */ \
- INTEL_VGA_DEVICE(0x0C22, info), /* SDV GT3 desktop */ \
INTEL_VGA_DEVICE(0x0C0A, info), /* SDV GT1 server */ \
- INTEL_VGA_DEVICE(0x0C1A, info), /* SDV GT2 server */ \
- INTEL_VGA_DEVICE(0x0C2A, info), /* SDV GT3 server */ \
INTEL_VGA_DEVICE(0x0C0B, info), /* SDV GT1 reserved */ \
- INTEL_VGA_DEVICE(0x0C1B, info), /* SDV GT2 reserved */ \
- INTEL_VGA_DEVICE(0x0C2B, info), /* SDV GT3 reserved */ \
INTEL_VGA_DEVICE(0x0C0E, info), /* SDV GT1 reserved */ \
- INTEL_VGA_DEVICE(0x0C1E, info), /* SDV GT2 reserved */ \
- INTEL_VGA_DEVICE(0x0C2E, info), /* SDV GT3 reserved */ \
INTEL_VGA_DEVICE(0x0A02, info), /* ULT GT1 desktop */ \
- INTEL_VGA_DEVICE(0x0A12, info), /* ULT GT2 desktop */ \
- INTEL_VGA_DEVICE(0x0A22, info), /* ULT GT3 desktop */ \
INTEL_VGA_DEVICE(0x0A0A, info), /* ULT GT1 server */ \
- INTEL_VGA_DEVICE(0x0A1A, info), /* ULT GT2 server */ \
- INTEL_VGA_DEVICE(0x0A2A, info), /* ULT GT3 server */ \
INTEL_VGA_DEVICE(0x0A0B, info), /* ULT GT1 reserved */ \
- INTEL_VGA_DEVICE(0x0A1B, info), /* ULT GT2 reserved */ \
- INTEL_VGA_DEVICE(0x0A2B, info), /* ULT GT3 reserved */ \
INTEL_VGA_DEVICE(0x0D02, info), /* CRW GT1 desktop */ \
- INTEL_VGA_DEVICE(0x0D12, info), /* CRW GT2 desktop */ \
- INTEL_VGA_DEVICE(0x0D22, info), /* CRW GT3 desktop */ \
INTEL_VGA_DEVICE(0x0D0A, info), /* CRW GT1 server */ \
- INTEL_VGA_DEVICE(0x0D1A, info), /* CRW GT2 server */ \
- INTEL_VGA_DEVICE(0x0D2A, info), /* CRW GT3 server */ \
INTEL_VGA_DEVICE(0x0D0B, info), /* CRW GT1 reserved */ \
- INTEL_VGA_DEVICE(0x0D1B, info), /* CRW GT2 reserved */ \
- INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \
INTEL_VGA_DEVICE(0x0D0E, info), /* CRW GT1 reserved */ \
- INTEL_VGA_DEVICE(0x0D1E, info), /* CRW GT2 reserved */ \
- INTEL_VGA_DEVICE(0x0D2E, info), /* CRW GT3 reserved */ \
INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
+ INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \
+ INTEL_VGA_DEVICE(0x0A06, info), /* ULT GT1 mobile */ \
+ INTEL_VGA_DEVICE(0x0A0E, info), /* ULX GT1 mobile */ \
+ INTEL_VGA_DEVICE(0x0D06, info) /* CRW GT1 mobile */
+
+#define INTEL_HSW_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \
+ INTEL_VGA_DEVICE(0x041a, info), /* GT2 server */ \
+ INTEL_VGA_DEVICE(0x041B, info), /* GT2 reserved */ \
+ INTEL_VGA_DEVICE(0x041E, info), /* GT2 reserved */ \
+ INTEL_VGA_DEVICE(0x0C12, info), /* SDV GT2 desktop */ \
+ INTEL_VGA_DEVICE(0x0C1A, info), /* SDV GT2 server */ \
+ INTEL_VGA_DEVICE(0x0C1B, info), /* SDV GT2 reserved */ \
+ INTEL_VGA_DEVICE(0x0C1E, info), /* SDV GT2 reserved */ \
+ INTEL_VGA_DEVICE(0x0A12, info), /* ULT GT2 desktop */ \
+ INTEL_VGA_DEVICE(0x0A1A, info), /* ULT GT2 server */ \
+ INTEL_VGA_DEVICE(0x0A1B, info), /* ULT GT2 reserved */ \
+ INTEL_VGA_DEVICE(0x0D12, info), /* CRW GT2 desktop */ \
+ INTEL_VGA_DEVICE(0x0D1A, info), /* CRW GT2 server */ \
+ INTEL_VGA_DEVICE(0x0D1B, info), /* CRW GT2 reserved */ \
+ INTEL_VGA_DEVICE(0x0D1E, info), /* CRW GT2 reserved */ \
INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
INTEL_VGA_DEVICE(0x0426, info), /* GT2 mobile */ \
- INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \
INTEL_VGA_DEVICE(0x0C16, info), /* SDV GT2 mobile */ \
- INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \
- INTEL_VGA_DEVICE(0x0A06, info), /* ULT GT1 mobile */ \
INTEL_VGA_DEVICE(0x0A16, info), /* ULT GT2 mobile */ \
- INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \
- INTEL_VGA_DEVICE(0x0A0E, info), /* ULX GT1 mobile */ \
INTEL_VGA_DEVICE(0x0A1E, info), /* ULX GT2 mobile */ \
+ INTEL_VGA_DEVICE(0x0D16, info) /* CRW GT2 mobile */
+
+#define INTEL_HSW_GT3_IDS(info) \
+ INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \
+ INTEL_VGA_DEVICE(0x042a, info), /* GT3 server */ \
+ INTEL_VGA_DEVICE(0x042B, info), /* GT3 reserved */ \
+ INTEL_VGA_DEVICE(0x042E, info), /* GT3 reserved */ \
+ INTEL_VGA_DEVICE(0x0C22, info), /* SDV GT3 desktop */ \
+ INTEL_VGA_DEVICE(0x0C2A, info), /* SDV GT3 server */ \
+ INTEL_VGA_DEVICE(0x0C2B, info), /* SDV GT3 reserved */ \
+ INTEL_VGA_DEVICE(0x0C2E, info), /* SDV GT3 reserved */ \
+ INTEL_VGA_DEVICE(0x0A22, info), /* ULT GT3 desktop */ \
+ INTEL_VGA_DEVICE(0x0A2A, info), /* ULT GT3 server */ \
+ INTEL_VGA_DEVICE(0x0A2B, info), /* ULT GT3 reserved */ \
+ INTEL_VGA_DEVICE(0x0D22, info), /* CRW GT3 desktop */ \
+ INTEL_VGA_DEVICE(0x0D2A, info), /* CRW GT3 server */ \
+ INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \
+ INTEL_VGA_DEVICE(0x0D2E, info), /* CRW GT3 reserved */ \
+ INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \
+ INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \
INTEL_VGA_DEVICE(0x0A2E, info), /* ULT GT3 reserved */ \
- INTEL_VGA_DEVICE(0x0D06, info), /* CRW GT1 mobile */ \
- INTEL_VGA_DEVICE(0x0D16, info), /* CRW GT2 mobile */ \
INTEL_VGA_DEVICE(0x0D26, info) /* CRW GT3 mobile */
+#define INTEL_HSW_IDS(info) \
+ INTEL_HSW_GT1_IDS(info), \
+ INTEL_HSW_GT2_IDS(info), \
+ INTEL_HSW_GT3_IDS(info)
+
#define INTEL_VLV_IDS(info) \
INTEL_VGA_DEVICE(0x0f30, info), \
INTEL_VGA_DEVICE(0x0f31, info), \
@@ -212,17 +229,19 @@
INTEL_VGA_DEVICE(0x0157, info), \
INTEL_VGA_DEVICE(0x0155, info)
-#define INTEL_BDW_GT12_IDS(info) \
+#define INTEL_BDW_GT1_IDS(info) \
INTEL_VGA_DEVICE(0x1602, info), /* GT1 ULT */ \
INTEL_VGA_DEVICE(0x1606, info), /* GT1 ULT */ \
INTEL_VGA_DEVICE(0x160B, info), /* GT1 Iris */ \
INTEL_VGA_DEVICE(0x160E, info), /* GT1 ULX */ \
- INTEL_VGA_DEVICE(0x1612, info), /* GT2 Halo */ \
+ INTEL_VGA_DEVICE(0x160A, info), /* GT1 Server */ \
+ INTEL_VGA_DEVICE(0x160D, info) /* GT1 Workstation */
+
+#define INTEL_BDW_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x1612, info), /* GT2 Halo */ \
INTEL_VGA_DEVICE(0x1616, info), /* GT2 ULT */ \
INTEL_VGA_DEVICE(0x161B, info), /* GT2 ULT */ \
- INTEL_VGA_DEVICE(0x161E, info), /* GT2 ULX */ \
- INTEL_VGA_DEVICE(0x160A, info), /* GT1 Server */ \
- INTEL_VGA_DEVICE(0x160D, info), /* GT1 Workstation */ \
+ INTEL_VGA_DEVICE(0x161E, info), /* GT2 ULX */ \
INTEL_VGA_DEVICE(0x161A, info), /* GT2 Server */ \
INTEL_VGA_DEVICE(0x161D, info) /* GT2 Workstation */
@@ -243,7 +262,8 @@
INTEL_VGA_DEVICE(0x163D, info) /* Workstation */
#define INTEL_BDW_IDS(info) \
- INTEL_BDW_GT12_IDS(info), \
+ INTEL_BDW_GT1_IDS(info), \
+ INTEL_BDW_GT2_IDS(info), \
INTEL_BDW_GT3_IDS(info), \
INTEL_BDW_RSVD_IDS(info)
@@ -335,20 +355,22 @@
INTEL_KBL_GT4_IDS(info)
/* CFL S */
-#define INTEL_CFL_S_IDS(info) \
+#define INTEL_CFL_S_GT1_IDS(info) \
INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \
- INTEL_VGA_DEVICE(0x3E93, info), /* SRV GT1 */ \
+ INTEL_VGA_DEVICE(0x3E93, info) /* SRV GT1 */
+
+#define INTEL_CFL_S_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \
INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \
INTEL_VGA_DEVICE(0x3E96, info) /* SRV GT2 */
/* CFL H */
-#define INTEL_CFL_H_IDS(info) \
+#define INTEL_CFL_H_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
/* CFL U */
-#define INTEL_CFL_U_IDS(info) \
+#define INTEL_CFL_U_GT3_IDS(info) \
INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x3EA8, info), /* ULT GT3 */ \
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/3] drm/i915: rework IS_*_GT* macros
2017-08-29 17:46 [PATCH v2 0/3] drm/i915: add perf support for Coffeelake Lionel Landwerlin
2017-08-29 17:46 ` [PATCH v2 1/3] drm/i915: add GT number to intel_device_info Lionel Landwerlin
@ 2017-08-29 17:46 ` Lionel Landwerlin
2017-08-29 17:46 ` [PATCH v2 3/3] drm/i915/perf: add support for Coffeelake GT2 Lionel Landwerlin
2017-08-29 18:04 ` ✗ Fi.CI.BAT: failure for drm/i915: add perf support for Coffeelake (rev2) Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Lionel Landwerlin @ 2017-08-29 17:46 UTC (permalink / raw)
To: intel-gfx
We can now make use of the intel_device_info.gt field.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 3d417537bd59..51c25b65611c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2869,9 +2869,8 @@ intel_info(const struct drm_i915_private *dev_priv)
#define IS_G33(dev_priv) ((dev_priv)->info.platform == INTEL_G33)
#define IS_IRONLAKE_M(dev_priv) (INTEL_DEVID(dev_priv) == 0x0046)
#define IS_IVYBRIDGE(dev_priv) ((dev_priv)->info.platform == INTEL_IVYBRIDGE)
-#define IS_IVB_GT1(dev_priv) (INTEL_DEVID(dev_priv) == 0x0156 || \
- INTEL_DEVID(dev_priv) == 0x0152 || \
- INTEL_DEVID(dev_priv) == 0x015a)
+#define IS_IVB_GT1(dev_priv) (IS_IVYBRIDGE(dev_priv) && \
+ (dev_priv)->info.gt == 1)
#define IS_VALLEYVIEW(dev_priv) ((dev_priv)->info.platform == INTEL_VALLEYVIEW)
#define IS_CHERRYVIEW(dev_priv) ((dev_priv)->info.platform == INTEL_CHERRYVIEW)
#define IS_HASWELL(dev_priv) ((dev_priv)->info.platform == INTEL_HASWELL)
@@ -2893,11 +2892,11 @@ intel_info(const struct drm_i915_private *dev_priv)
#define IS_BDW_ULX(dev_priv) (IS_BROADWELL(dev_priv) && \
(INTEL_DEVID(dev_priv) & 0xf) == 0xe)
#define IS_BDW_GT3(dev_priv) (IS_BROADWELL(dev_priv) && \
- (INTEL_DEVID(dev_priv) & 0x00F0) == 0x0020)
+ (dev_priv)->info.gt == 3)
#define IS_HSW_ULT(dev_priv) (IS_HASWELL(dev_priv) && \
(INTEL_DEVID(dev_priv) & 0xFF00) == 0x0A00)
#define IS_HSW_GT3(dev_priv) (IS_HASWELL(dev_priv) && \
- (INTEL_DEVID(dev_priv) & 0x00F0) == 0x0020)
+ (dev_priv)->info.gt == 3)
/* ULX machines are also considered ULT. */
#define IS_HSW_ULX(dev_priv) (INTEL_DEVID(dev_priv) == 0x0A0E || \
INTEL_DEVID(dev_priv) == 0x0A1E)
@@ -2918,15 +2917,15 @@ intel_info(const struct drm_i915_private *dev_priv)
INTEL_DEVID(dev_priv) == 0x5915 || \
INTEL_DEVID(dev_priv) == 0x591E)
#define IS_SKL_GT2(dev_priv) (IS_SKYLAKE(dev_priv) && \
- (INTEL_DEVID(dev_priv) & 0x00F0) == 0x0010)
+ (dev_priv)->info.gt == 2)
#define IS_SKL_GT3(dev_priv) (IS_SKYLAKE(dev_priv) && \
- (INTEL_DEVID(dev_priv) & 0x00F0) == 0x0020)
+ (dev_priv)->info.gt == 3)
#define IS_SKL_GT4(dev_priv) (IS_SKYLAKE(dev_priv) && \
- (INTEL_DEVID(dev_priv) & 0x00F0) == 0x0030)
+ (dev_priv)->info.gt == 4)
#define IS_KBL_GT2(dev_priv) (IS_KABYLAKE(dev_priv) && \
- (INTEL_DEVID(dev_priv) & 0x00F0) == 0x0010)
+ (dev_priv)->info.gt == 2)
#define IS_KBL_GT3(dev_priv) (IS_KABYLAKE(dev_priv) && \
- (INTEL_DEVID(dev_priv) & 0x00F0) == 0x0020)
+ (dev_priv)->info.gt == 3)
#define IS_CFL_ULT(dev_priv) (IS_COFFEELAKE(dev_priv) && \
(INTEL_DEVID(dev_priv) & 0x00F0) == 0x00A0)
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 3/3] drm/i915/perf: add support for Coffeelake GT2
2017-08-29 17:46 [PATCH v2 0/3] drm/i915: add perf support for Coffeelake Lionel Landwerlin
2017-08-29 17:46 ` [PATCH v2 1/3] drm/i915: add GT number to intel_device_info Lionel Landwerlin
2017-08-29 17:46 ` [PATCH v2 2/3] drm/i915: rework IS_*_GT* macros Lionel Landwerlin
@ 2017-08-29 17:46 ` Lionel Landwerlin
2017-08-29 18:04 ` ✗ Fi.CI.BAT: failure for drm/i915: add perf support for Coffeelake (rev2) Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Lionel Landwerlin @ 2017-08-29 17:46 UTC (permalink / raw)
To: intel-gfx
Add the test configuration & timestamp frequency for Coffeelake GT2.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
drivers/gpu/drm/i915/Makefile | 3 +-
drivers/gpu/drm/i915/i915_drv.h | 2 +
drivers/gpu/drm/i915/i915_oa_cflgt2.c | 109 ++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/i915_oa_cflgt2.h | 34 +++++++++++
drivers/gpu/drm/i915/i915_perf.c | 5 ++
5 files changed, 152 insertions(+), 1 deletion(-)
create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt2.c
create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt2.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 892f52b53060..a972c770c4e9 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -139,7 +139,8 @@ i915-y += i915_perf.o \
i915_oa_bxt.o \
i915_oa_kblgt2.o \
i915_oa_kblgt3.o \
- i915_oa_glk.o
+ i915_oa_glk.o \
+ i915_oa_cflgt2.o
ifeq ($(CONFIG_DRM_I915_GVT),y)
i915-y += intel_gvt.o
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 51c25b65611c..004338f5cdc5 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2928,6 +2928,8 @@ intel_info(const struct drm_i915_private *dev_priv)
(dev_priv)->info.gt == 3)
#define IS_CFL_ULT(dev_priv) (IS_COFFEELAKE(dev_priv) && \
(INTEL_DEVID(dev_priv) & 0x00F0) == 0x00A0)
+#define IS_CFL_GT2(dev_priv) (IS_COFFEELAKE(dev_priv) && \
+ (dev_priv)->info.gt == 2)
#define IS_ALPHA_SUPPORT(intel_info) ((intel_info)->is_alpha_support)
diff --git a/drivers/gpu/drm/i915/i915_oa_cflgt2.c b/drivers/gpu/drm/i915/i915_oa_cflgt2.c
new file mode 100644
index 000000000000..368c87d7ee9a
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_oa_cflgt2.c
@@ -0,0 +1,109 @@
+/*
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ *
+ *
+ * Copyright (c) 2015 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_cflgt2.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+ { _MMIO(0x2740), 0x00000000 },
+ { _MMIO(0x2744), 0x00800000 },
+ { _MMIO(0x2714), 0xf0800000 },
+ { _MMIO(0x2710), 0x00000000 },
+ { _MMIO(0x2724), 0xf0800000 },
+ { _MMIO(0x2720), 0x00000000 },
+ { _MMIO(0x2770), 0x00000004 },
+ { _MMIO(0x2774), 0x00000000 },
+ { _MMIO(0x2778), 0x00000003 },
+ { _MMIO(0x277c), 0x00000000 },
+ { _MMIO(0x2780), 0x00000007 },
+ { _MMIO(0x2784), 0x00000000 },
+ { _MMIO(0x2788), 0x00100002 },
+ { _MMIO(0x278c), 0x0000fff7 },
+ { _MMIO(0x2790), 0x00100002 },
+ { _MMIO(0x2794), 0x0000ffcf },
+ { _MMIO(0x2798), 0x00100082 },
+ { _MMIO(0x279c), 0x0000ffef },
+ { _MMIO(0x27a0), 0x001000c2 },
+ { _MMIO(0x27a4), 0x0000ffe7 },
+ { _MMIO(0x27a8), 0x00100001 },
+ { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+ { _MMIO(0x9840), 0x00000080 },
+ { _MMIO(0x9888), 0x11810000 },
+ { _MMIO(0x9888), 0x07810013 },
+ { _MMIO(0x9888), 0x1f810000 },
+ { _MMIO(0x9888), 0x1d810000 },
+ { _MMIO(0x9888), 0x1b930040 },
+ { _MMIO(0x9888), 0x07e54000 },
+ { _MMIO(0x9888), 0x1f908000 },
+ { _MMIO(0x9888), 0x11900000 },
+ { _MMIO(0x9888), 0x37900000 },
+ { _MMIO(0x9888), 0x53900000 },
+ { _MMIO(0x9888), 0x45900000 },
+ { _MMIO(0x9888), 0x33900000 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+ return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_cflgt2(struct drm_i915_private *dev_priv)
+{
+ strncpy(dev_priv->perf.oa.test_config.uuid,
+ "74fb4902-d3d3-4237-9e90-cbdc68d0a446",
+ UUID_STRING_LEN);
+ dev_priv->perf.oa.test_config.id = 1;
+
+ dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+ dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+ dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+ dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+ dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+ dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+ dev_priv->perf.oa.test_config.sysfs_metric.name = "74fb4902-d3d3-4237-9e90-cbdc68d0a446";
+ dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+ dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+ dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+ dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+ dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/i915_oa_cflgt2.h b/drivers/gpu/drm/i915/i915_oa_cflgt2.h
new file mode 100644
index 000000000000..1f3268ef2ea2
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_oa_cflgt2.h
@@ -0,0 +1,34 @@
+/*
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ *
+ *
+ * Copyright (c) 2015 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#ifndef __I915_OA_CFLGT2_H__
+#define __I915_OA_CFLGT2_H__
+
+extern void i915_perf_load_test_config_cflgt2(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 94185d610673..cbe8d87b21f3 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -206,6 +206,7 @@
#include "i915_oa_kblgt2.h"
#include "i915_oa_kblgt3.h"
#include "i915_oa_glk.h"
+#include "i915_oa_cflgt2.h"
/* HW requires this to be a power of two, between 128k and 16M, though driver
* is currently generally designed assuming the largest 16M size is used such
@@ -2927,6 +2928,9 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
i915_perf_load_test_config_kblgt3(dev_priv);
} else if (IS_GEMINILAKE(dev_priv)) {
i915_perf_load_test_config_glk(dev_priv);
+ } else if (IS_COFFEELAKE(dev_priv)) {
+ if (IS_CFL_GT2(dev_priv))
+ i915_perf_load_test_config_cflgt2(dev_priv);
}
if (dev_priv->perf.oa.test_config.id == 0)
@@ -3453,6 +3457,7 @@ void i915_perf_init(struct drm_i915_private *dev_priv)
break;
case INTEL_SKYLAKE:
case INTEL_KABYLAKE:
+ case INTEL_COFFEELAKE:
dev_priv->perf.oa.timestamp_frequency = 12000000;
break;
default:
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: add perf support for Coffeelake (rev2)
2017-08-29 17:46 [PATCH v2 0/3] drm/i915: add perf support for Coffeelake Lionel Landwerlin
` (2 preceding siblings ...)
2017-08-29 17:46 ` [PATCH v2 3/3] drm/i915/perf: add support for Coffeelake GT2 Lionel Landwerlin
@ 2017-08-29 18:04 ` Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2017-08-29 18:04 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: add perf support for Coffeelake (rev2)
URL : https://patchwork.freedesktop.org/series/29489/
State : failure
== Summary ==
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
CHK scripts/mod/devicetable-offsets.h
CHK include/generated/compile.h
CC arch/x86/kernel/early-quirks.o
arch/x86/kernel/early-quirks.c:519:2: error: implicit declaration of function ‘INTEL_SNB_D_IDS’ [-Werror=implicit-function-declaration]
INTEL_SNB_D_IDS(&gen6_early_ops),
^~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:519:2: error: initializer element is not constant
arch/x86/kernel/early-quirks.c:519:2: note: (near initialization for ‘intel_early_ids[37].vendor’)
arch/x86/kernel/early-quirks.c:520:2: error: implicit declaration of function ‘INTEL_SNB_M_IDS’ [-Werror=implicit-function-declaration]
INTEL_SNB_M_IDS(&gen6_early_ops),
^~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:520:2: error: initializer element is not constant
arch/x86/kernel/early-quirks.c:520:2: note: (near initialization for ‘intel_early_ids[37].device’)
arch/x86/kernel/early-quirks.c:521:2: error: implicit declaration of function ‘INTEL_IVB_M_IDS’ [-Werror=implicit-function-declaration]
INTEL_IVB_M_IDS(&gen6_early_ops),
^~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:521:2: error: initializer element is not constant
arch/x86/kernel/early-quirks.c:521:2: note: (near initialization for ‘intel_early_ids[37].subvendor’)
arch/x86/kernel/early-quirks.c:522:2: error: implicit declaration of function ‘INTEL_IVB_D_IDS’ [-Werror=implicit-function-declaration]
INTEL_IVB_D_IDS(&gen6_early_ops),
^~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:522:2: error: initializer element is not constant
arch/x86/kernel/early-quirks.c:522:2: note: (near initialization for ‘intel_early_ids[37].subdevice’)
arch/x86/kernel/early-quirks.c:523:2: warning: braces around scalar initializer
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: (near initialization for ‘intel_early_ids[37].class’)
In file included from ./include/drm/i915_drm.h:29:0,
from arch/x86/kernel/early-quirks.c:19:
./include/drm/i915_pciids.h:154:19: warning: excess elements in scalar initializer
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^
./include/drm/i915_pciids.h:39:10: note: in definition of macro ‘INTEL_VGA_DEVICE’
0x8086, id, \
^~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:154:19: note: (near initialization for ‘intel_early_ids[37].class’)
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^
./include/drm/i915_pciids.h:39:10: note: in definition of macro ‘INTEL_VGA_DEVICE’
0x8086, id, \
^~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:40:2: warning: excess elements in scalar initializer
~0, ~0, \
^
./include/drm/i915_pciids.h:154:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:40:2: note: (near initialization for ‘intel_early_ids[37].class’)
~0, ~0, \
^
./include/drm/i915_pciids.h:154:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:40:6: warning: excess elements in scalar initializer
~0, ~0, \
^
./include/drm/i915_pciids.h:154:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:40:6: note: (near initialization for ‘intel_early_ids[37].class’)
~0, ~0, \
^
./include/drm/i915_pciids.h:154:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:41:2: warning: excess elements in scalar initializer
0x030000, 0xff0000, \
^
./include/drm/i915_pciids.h:154:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:41:2: note: (near initialization for ‘intel_early_ids[37].class’)
0x030000, 0xff0000, \
^
./include/drm/i915_pciids.h:154:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:41:12: warning: excess elements in scalar initializer
0x030000, 0xff0000, \
^
./include/drm/i915_pciids.h:154:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:41:12: note: (near initialization for ‘intel_early_ids[37].class’)
0x030000, 0xff0000, \
^
./include/drm/i915_pciids.h:154:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:42:2: warning: excess elements in scalar initializer
(unsigned long) info }
^
./include/drm/i915_pciids.h:154:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:42:2: note: (near initialization for ‘intel_early_ids[37].class’)
(unsigned long) info }
^
./include/drm/i915_pciids.h:154:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:38:36: warning: missing braces around initializer [-Wmissing-braces]
#define INTEL_VGA_DEVICE(id, info) { \
^
./include/drm/i915_pciids.h:154:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:38:36: note: (near initialization for ‘intel_early_ids[37].class’)
#define INTEL_VGA_DEVICE(id, info) { \
^
./include/drm/i915_pciids.h:154:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: warning: braces around scalar initializer
arch/x86/kernel/early-quirks.c:523:2: note: (near initialization for ‘intel_early_ids[37].class_mask’)
In file included from ./include/drm/i915_drm.h:29:0,
from arch/x86/kernel/early-quirks.c:19:
./include/drm/i915_pciids.h:155:19: warning: excess elements in scalar initializer
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^
./include/drm/i915_pciids.h:39:10: note: in definition of macro ‘INTEL_VGA_DEVICE’
0x8086, id, \
^~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:155:19: note: (near initialization for ‘intel_early_ids[37].class_mask’)
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^
./include/drm/i915_pciids.h:39:10: note: in definition of macro ‘INTEL_VGA_DEVICE’
0x8086, id, \
^~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:40:2: warning: excess elements in scalar initializer
~0, ~0, \
^
./include/drm/i915_pciids.h:155:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:40:2: note: (near initialization for ‘intel_early_ids[37].class_mask’)
~0, ~0, \
^
./include/drm/i915_pciids.h:155:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:40:6: warning: excess elements in scalar initializer
~0, ~0, \
^
./include/drm/i915_pciids.h:155:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:40:6: note: (near initialization for ‘intel_early_ids[37].class_mask’)
~0, ~0, \
^
./include/drm/i915_pciids.h:155:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:41:2: warning: excess elements in scalar initializer
0x030000, 0xff0000, \
^
./include/drm/i915_pciids.h:155:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:41:2: note: (near initialization for ‘intel_early_ids[37].class_mask’)
0x030000, 0xff0000, \
^
./include/drm/i915_pciids.h:155:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:41:12: warning: excess elements in scalar initializer
0x030000, 0xff0000, \
^
./include/drm/i915_pciids.h:155:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:41:12: note: (near initialization for ‘intel_early_ids[37].class_mask’)
0x030000, 0xff0000, \
^
./include/drm/i915_pciids.h:155:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:42:2: warning: excess elements in scalar initializer
(unsigned long) info }
^
./include/drm/i915_pciids.h:155:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:42:2: note: (near initialization for ‘intel_early_ids[37].class_mask’)
(unsigned long) info }
^
./include/drm/i915_pciids.h:155:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:38:36: warning: missing braces around initializer [-Wmissing-braces]
#define INTEL_VGA_DEVICE(id, info) { \
^
./include/drm/i915_pciids.h:155:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:38:36: note: (near initialization for ‘intel_early_ids[37].class_mask’)
#define INTEL_VGA_DEVICE(id, info) { \
^
./include/drm/i915_pciids.h:155:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: warning: braces around scalar initializer
arch/x86/kernel/early-quirks.c:523:2: note: (near initialization for ‘intel_early_ids[37].driver_data’)
In file included from ./include/drm/i915_drm.h:29:0,
from arch/x86/kernel/early-quirks.c:19:
./include/drm/i915_pciids.h:156:19: warning: excess elements in scalar initializer
INTEL_VGA_DEVICE(0x040B, info), /* GT1 reserved */ \
^
./include/drm/i915_pciids.h:39:10: note: in definition of macro ‘INTEL_VGA_DEVICE’
0x8086, id, \
^~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:156:19: note: (near initialization for ‘intel_early_ids[37].driver_data’)
INTEL_VGA_DEVICE(0x040B, info), /* GT1 reserved */ \
^
./include/drm/i915_pciids.h:39:10: note: in definition of macro ‘INTEL_VGA_DEVICE’
0x8086, id, \
^~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:40:2: warning: excess elements in scalar initializer
~0, ~0, \
^
./include/drm/i915_pciids.h:156:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040B, info), /* GT1 reserved */ \
^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:220:2: note: in expansion of macro ‘INTEL_HSW_GT1_IDS’
INTEL_HSW_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:523:2: note: in expansion of macro ‘INTEL_HSW_IDS’
INTEL_HSW_IDS(&gen6_early_ops),
^~~~~~~~~~~~~
./include/drm/i915_pciids.h:40:2: note: (near initialization for ‘intel_early_ids[37].driver_data’)
~0, ~0, \
^
./include/drm/i915_pciids.h:156:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x040B, info), /* GT1 reserved */ \
^~~~~~~~~~~~~~~~
./include/drm
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-08-29 18:04 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-29 17:46 [PATCH v2 0/3] drm/i915: add perf support for Coffeelake Lionel Landwerlin
2017-08-29 17:46 ` [PATCH v2 1/3] drm/i915: add GT number to intel_device_info Lionel Landwerlin
2017-08-29 17:46 ` [PATCH v2 2/3] drm/i915: rework IS_*_GT* macros Lionel Landwerlin
2017-08-29 17:46 ` [PATCH v2 3/3] drm/i915/perf: add support for Coffeelake GT2 Lionel Landwerlin
2017-08-29 18:04 ` ✗ Fi.CI.BAT: failure for drm/i915: add perf support for Coffeelake (rev2) Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.