[Intel-gfx] [CI 1/6] drm/i915/ehl: Add EHL platform info and PCI IDs

2019-03-22 Thread Rodrigo Vivi
From: James Ausmus 

Add known EHL PCI IDs.

v2 (Rodrigo): Removed x86 early quirk. To be sent in a separated
  patch cc'ing the appropriated list and maintainers for
  proper ack.
v3: (Rodrigo): - Removed .num_pipes = 3 that is coming since GEN&_FEATURES.
   - Added ppgtt type and size after rework from Bob and Chris
v4: (Rodrigo): - remove ppgtt type added on v3. Jose pointed it is not
 needed.

Cc: Bob Paauwe 
Cc: Chris Wilson 
Cc: José Roberto de Souza 
Signed-off-by: James Ausmus 
Signed-off-by: Rodrigo Vivi 
Reviewed-by: Bob Paauwe 
Reviewed-by: José Roberto de Souza 
---
 drivers/gpu/drm/i915/i915_pci.c | 9 +
 include/drm/i915_pciids.h   | 7 +++
 2 files changed, 16 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 7a6054eadb8e..fa99d68cbe7d 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -730,6 +730,14 @@ static const struct intel_device_info 
intel_icelake_11_info = {
BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2),
 };
 
+static const struct intel_device_info intel_elkhartlake_info = {
+   GEN11_FEATURES,
+   PLATFORM(INTEL_ICELAKE),
+   .is_alpha_support = 1,
+   .engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(VCS0),
+   .ppgtt_size = 36,
+};
+
 #undef GEN
 #undef PLATFORM
 
@@ -799,6 +807,7 @@ static const struct pci_device_id pciidlist[] = {
INTEL_CML_GT2_IDS(&intel_coffeelake_gt2_info),
INTEL_CNL_IDS(&intel_cannonlake_info),
INTEL_ICL_11_IDS(&intel_icelake_11_info),
+   INTEL_EHL_IDS(&intel_elkhartlake_info),
{0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 291b5e3fa59c..c7cdbfc4d033 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -498,4 +498,11 @@
INTEL_VGA_DEVICE(0x8A70, info), \
INTEL_VGA_DEVICE(0x8A53, info)
 
+/* EHL */
+#define INTEL_EHL_IDS(info) \
+   INTEL_VGA_DEVICE(0x4500, info), \
+   INTEL_VGA_DEVICE(0x4571, info), \
+   INTEL_VGA_DEVICE(0x4551, info), \
+   INTEL_VGA_DEVICE(0x4541, info)
+
 #endif /* _I915_PCIIDS_H */
-- 
2.20.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [CI 1/6] drm/i915/ehl: Add EHL platform info and PCI IDs

2019-03-21 Thread Rodrigo Vivi
From: James Ausmus 

Add known EHL PCI IDs.

v2 (Rodrigo): Removed x86 early quirk. To be sent in a separated
  patch cc'ing the appropriated list and maintainers for
  proper ack.
v3: (Rodrigo): - Removed .num_pipes = 3 that is coming since GEN&_FEATURES.
   - Added ppgtt type and size after rework from Bob and Chris

Cc: Bob Paauwe 
Cc: Chris Wilson 
Cc: José Roberto de Souza 
Signed-off-by: James Ausmus 
Signed-off-by: Rodrigo Vivi 
Reviewed-by: Bob Paauwe 
Reviewed-by: José Roberto de Souza 
---
 drivers/gpu/drm/i915/i915_pci.c | 10 ++
 include/drm/i915_pciids.h   |  7 +++
 2 files changed, 17 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 7a6054eadb8e..be028b5d80b2 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -730,6 +730,15 @@ static const struct intel_device_info 
intel_icelake_11_info = {
BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2),
 };
 
+static const struct intel_device_info intel_elkhartlake_info = {
+   GEN11_FEATURES,
+   PLATFORM(INTEL_ICELAKE),
+   .is_alpha_support = 1,
+   .engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(VCS0),
+   .ppgtt_type = INTEL_PPGTT_FULL,
+   .ppgtt_size = 36,
+};
+
 #undef GEN
 #undef PLATFORM
 
@@ -799,6 +808,7 @@ static const struct pci_device_id pciidlist[] = {
INTEL_CML_GT2_IDS(&intel_coffeelake_gt2_info),
INTEL_CNL_IDS(&intel_cannonlake_info),
INTEL_ICL_11_IDS(&intel_icelake_11_info),
+   INTEL_EHL_IDS(&intel_elkhartlake_info),
{0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 291b5e3fa59c..c7cdbfc4d033 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -498,4 +498,11 @@
INTEL_VGA_DEVICE(0x8A70, info), \
INTEL_VGA_DEVICE(0x8A53, info)
 
+/* EHL */
+#define INTEL_EHL_IDS(info) \
+   INTEL_VGA_DEVICE(0x4500, info), \
+   INTEL_VGA_DEVICE(0x4571, info), \
+   INTEL_VGA_DEVICE(0x4551, info), \
+   INTEL_VGA_DEVICE(0x4541, info)
+
 #endif /* _I915_PCIIDS_H */
-- 
2.20.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [CI 1/6] drm/i915/ehl: Add EHL platform info and PCI IDs

2019-03-15 Thread Rodrigo Vivi
From: James Ausmus 

Add known EHL PCI IDs.

v2 (Rodrigo): Removed x86 early quirk. To be sent in a separated
   patch cc'ing the appropriated list and maintainers for proper ack.

Cc: Bob Paauwe 
Signed-off-by: James Ausmus 
Signed-off-by: Rodrigo Vivi 
Reviewed-by: José Roberto de Souza 
Link: 
https://patchwork.freedesktop.org/patch/msgid/20190313211144.4842-1-rodrigo.v...@intel.com
---
 drivers/gpu/drm/i915/i915_pci.c | 9 +
 include/drm/i915_pciids.h   | 7 +++
 2 files changed, 16 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index ef7410c492fd..da199125c1e5 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -730,6 +730,14 @@ static const struct intel_device_info 
intel_icelake_11_info = {
BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2),
 };
 
+static const struct intel_device_info intel_elkhartlake_info = {
+   GEN11_FEATURES,
+   PLATFORM(INTEL_ICELAKE),
+   .num_pipes = 3,
+   .is_alpha_support = 1,
+   .engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(VCS0),
+};
+
 #undef GEN
 #undef PLATFORM
 
@@ -797,6 +805,7 @@ static const struct pci_device_id pciidlist[] = {
INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info),
INTEL_CNL_IDS(&intel_cannonlake_info),
INTEL_ICL_11_IDS(&intel_icelake_11_info),
+   INTEL_EHL_IDS(&intel_elkhartlake_info),
{0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index d20feeaa..a0e409e9e70d 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -472,4 +472,11 @@
INTEL_VGA_DEVICE(0x8A70, info), \
INTEL_VGA_DEVICE(0x8A53, info)
 
+/* EHL */
+#define INTEL_EHL_IDS(info) \
+   INTEL_VGA_DEVICE(0x4500, info), \
+   INTEL_VGA_DEVICE(0x4571, info), \
+   INTEL_VGA_DEVICE(0x4551, info), \
+   INTEL_VGA_DEVICE(0x4541, info)
+
 #endif /* _I915_PCIIDS_H */
-- 
2.20.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx