[cosmic][PATCH 0/4] drm/i915: Add missing pci-id's, and platform definitions for WHL & AML

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

[cosmic][PATCH 0/4] drm/i915: Add missing pci-id's, and platform definitions for WHL & AML

Timo Aaltonen-6
From: Timo Aaltonen <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1789924

One commit backported from 4.20 queue, others cherry-picked from 4.18/4.19.


José Roberto de Souza (2):
  drm/i915/whl: Introducing Whiskey Lake platform
  drm/i915/aml: Introducing Amber Lake platform

Matt Atwood (1):
  drm/i915/kbl: Add KBL GT2 sku

Rodrigo Vivi (1):
  drm/i915/cfl: Add a new CFL PCI ID.

 drivers/gpu/drm/i915/i915_pci.c |  5 ++++-
 include/drm/i915_pciids.h       | 37 +++++++++++++++++++++++----------
 2 files changed, 30 insertions(+), 12 deletions(-)

--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/4] drm/i915/kbl: Add KBL GT2 sku

Timo Aaltonen-6
From: Matt Atwood <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1789924

Adding a missing GT2 sku discovered off hardware.

Signed-off-by: Matt Atwood <[hidden email]>
Reviewed-by: Clint Taylor <[hidden email]>
Signed-off-by: Rodrigo Vivi <[hidden email]>
Link: https://patchwork.freedesktop.org/patch/msgid/1524522483-19987-1-git-send-email-matthew.s.atwood@...
(cherry picked from commit 672e314b21dc614894e69bb56a2b55cc7d256810)
Signed-off-by: Timo Aaltonen <[hidden email]>
---
 include/drm/i915_pciids.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 70f0c2535b87..bab70ff6e78b 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -349,6 +349,7 @@
 #define INTEL_KBL_GT2_IDS(info) \
  INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
  INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
+ INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
  INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
  INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
  INTEL_VGA_DEVICE(0x5912, info), /* DT  GT2 */ \
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/4] drm/i915/whl: Introducing Whiskey Lake platform

Timo Aaltonen-6
In reply to this post by Timo Aaltonen-6
From: José Roberto de Souza <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1789924

Whiskey Lake uses the same gen graphics as Coffe Lake, including some
ids that were previously marked as reserved on Coffe Lake, but that
now are moved to WHL page.

So, let's just move them to WHL macros that will feed into CFL macro
just to keep it better organized to make easier future code review
but it will be handled as a CFL.

v2:
Fixing GT level of some ids

Cc: Rodrigo Vivi <[hidden email]>
Signed-off-by: José Roberto de Souza <[hidden email]>
Reviewed-by: Rodrigo Vivi <[hidden email]>
Signed-off-by: Rodrigo Vivi <[hidden email]>
Link: https://patchwork.freedesktop.org/patch/msgid/20180614233720.30517-1-jose.souza@...
(cherry picked from commit b9be78531d2710f4302545aa80e0678ed0a3dd09)
Signed-off-by: Timo Aaltonen <[hidden email]>
---
 drivers/gpu/drm/i915/i915_pci.c |  4 +++-
 include/drm/i915_pciids.h       | 28 ++++++++++++++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 062e91b39085..d90d2e6955ad 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -661,9 +661,11 @@ static const struct pci_device_id pciidlist[] = {
  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_GT1_IDS(&intel_coffeelake_gt1_info),
  INTEL_CFL_U_GT2_IDS(&intel_coffeelake_gt2_info),
  INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
+ INTEL_WHL_U_GT1_IDS(&intel_coffeelake_gt1_info),
+ INTEL_WHL_U_GT2_IDS(&intel_coffeelake_gt2_info),
+ INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info),
  INTEL_CNL_IDS(&intel_cannonlake_info),
  INTEL_ICL_11_IDS(&intel_icelake_11_info),
  {0, 0, 0}
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index bab70ff6e78b..d03350a38025 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -388,32 +388,40 @@
  INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
  INTEL_VGA_DEVICE(0x3E94, info)  /* Halo GT2 */
 
-/* CFL U GT1 */
-#define INTEL_CFL_U_GT1_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA1, info), \
- INTEL_VGA_DEVICE(0x3EA4, info)
-
 /* CFL U GT2 */
 #define INTEL_CFL_U_GT2_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA0, info), \
- INTEL_VGA_DEVICE(0x3EA3, info), \
  INTEL_VGA_DEVICE(0x3EA9, info)
 
 /* CFL U GT3 */
 #define INTEL_CFL_U_GT3_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA2, info), /* ULT GT3 */ \
  INTEL_VGA_DEVICE(0x3EA5, info), /* ULT GT3 */ \
  INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \
  INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \
  INTEL_VGA_DEVICE(0x3EA8, info)  /* ULT GT3 */
 
+/* WHL/CFL U GT1 */
+#define INTEL_WHL_U_GT1_IDS(info) \
+ INTEL_VGA_DEVICE(0x3EA1, info)
+
+/* WHL/CFL U GT2 */
+#define INTEL_WHL_U_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x3EA0, info)
+
+/* WHL/CFL U GT3 */
+#define INTEL_WHL_U_GT3_IDS(info) \
+ INTEL_VGA_DEVICE(0x3EA2, info), \
+ INTEL_VGA_DEVICE(0x3EA3, info), \
+ INTEL_VGA_DEVICE(0x3EA4, info)
+
 #define INTEL_CFL_IDS(info)   \
  INTEL_CFL_S_GT1_IDS(info), \
  INTEL_CFL_S_GT2_IDS(info), \
  INTEL_CFL_H_GT2_IDS(info), \
- INTEL_CFL_U_GT1_IDS(info), \
  INTEL_CFL_U_GT2_IDS(info), \
- INTEL_CFL_U_GT3_IDS(info)
+ INTEL_CFL_U_GT3_IDS(info), \
+ INTEL_WHL_U_GT1_IDS(info), \
+ INTEL_WHL_U_GT2_IDS(info), \
+ INTEL_WHL_U_GT3_IDS(info)
 
 /* CNL */
 #define INTEL_CNL_IDS(info) \
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 3/4] drm/i915/aml: Introducing Amber Lake platform

Timo Aaltonen-6
In reply to this post by Timo Aaltonen-6
From: José Roberto de Souza <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1789924

Amber Lake uses the same gen graphics as Kaby Lake, including a id
that were previously marked as reserved on Kaby Lake, but that
now is moved to AML page.

So, let's just move it to AML macro that will feed into KBL macro
just to keep it better organized to make easier future code review
but it will be handled as a KBL.

Reviewed-by: Rodrigo Vivi <[hidden email]>
Signed-off-by: José Roberto de Souza <[hidden email]>
Signed-off-by: Rodrigo Vivi <[hidden email]>
Link: https://patchwork.freedesktop.org/patch/msgid/20180614233720.30517-2-jose.souza@...
(cherry picked from commit e364672477a105029346f0888bfa797b1ec3eee4)
Signed-off-by: Timo Aaltonen <[hidden email]>
---
 drivers/gpu/drm/i915/i915_pci.c | 1 +
 include/drm/i915_pciids.h       | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index d90d2e6955ad..4442fdf42690 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -658,6 +658,7 @@ static const struct pci_device_id pciidlist[] = {
  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_AML_GT2_IDS(&intel_kabylake_gt2_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),
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index d03350a38025..fbf5cfc9b352 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -349,7 +349,6 @@
 #define INTEL_KBL_GT2_IDS(info) \
  INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
  INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
- INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
  INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
  INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
  INTEL_VGA_DEVICE(0x5912, info), /* DT  GT2 */ \
@@ -365,11 +364,17 @@
 #define INTEL_KBL_GT4_IDS(info) \
  INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
 
+/* AML/KBL Y GT2 */
+#define INTEL_AML_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x591C, info),  /* ULX GT2 */ \
+ INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
+
 #define INTEL_KBL_IDS(info) \
  INTEL_KBL_GT1_IDS(info), \
  INTEL_KBL_GT2_IDS(info), \
  INTEL_KBL_GT3_IDS(info), \
- INTEL_KBL_GT4_IDS(info)
+ INTEL_KBL_GT4_IDS(info), \
+ INTEL_AML_GT2_IDS(info)
 
 /* CFL S */
 #define INTEL_CFL_S_GT1_IDS(info) \
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 4/4] drm/i915/cfl: Add a new CFL PCI ID.

Timo Aaltonen-6
In reply to this post by Timo Aaltonen-6
From: Rodrigo Vivi <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1789924

One more CFL ID added to spec.

Cc: José Roberto de Souza <[hidden email]>
Signed-off-by: Rodrigo Vivi <[hidden email]>
Reviewed-by: José Roberto de Souza <[hidden email]>
Link: https://patchwork.freedesktop.org/patch/msgid/20180803232721.20038-1-rodrigo.vivi@...
(cherry picked from drm-intel-next commit d0e062ebb3a44b56a7e672da568334c76f763552)
Signed-off-by: Timo Aaltonen <[hidden email]>
---
 include/drm/i915_pciids.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index fbf5cfc9b352..fd965ffbb92e 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -386,6 +386,7 @@
  INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \
  INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \
  INTEL_VGA_DEVICE(0x3E96, info), /* SRV GT2 */ \
+ INTEL_VGA_DEVICE(0x3E98, info), /* SRV GT2 */ \
  INTEL_VGA_DEVICE(0x3E9A, info)  /* SRV GT2 */
 
 /* CFL H */
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [cosmic][PATCH 0/4] drm/i915: Add missing pci-id's, and platform definitions for WHL & AML

Timo Aaltonen-6
In reply to this post by Timo Aaltonen-6
On 05.09.2018 12:40, Timo Aaltonen wrote:
> From: Timo Aaltonen <[hidden email]>
>
> BugLink: http://bugs.launchpad.net/bugs/1789924
>
> One commit backported from 4.20 queue, others cherry-picked from 4.18/4.19.

hah, so I should've rebased the branch first.. the first commit can be
dropped from the list since master-next is on 4.18 these days.



--
t

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK/cmnt: [cosmic][PATCH 0/4] drm/i915: Add missing pci-id's, and platform definitions for WHL & AML

Colin Ian King-2
In reply to this post by Timo Aaltonen-6
On 05/09/18 10:40, Timo Aaltonen wrote:

> From: Timo Aaltonen <[hidden email]>
>
> BugLink: http://bugs.launchpad.net/bugs/1789924
>
> One commit backported from 4.20 queue, others cherry-picked from 4.18/4.19.
>
>
> José Roberto de Souza (2):
>   drm/i915/whl: Introducing Whiskey Lake platform
>   drm/i915/aml: Introducing Amber Lake platform
>
> Matt Atwood (1):
>   drm/i915/kbl: Add KBL GT2 sku
>
> Rodrigo Vivi (1):
>   drm/i915/cfl: Add a new CFL PCI ID.
>
>  drivers/gpu/drm/i915/i915_pci.c |  5 ++++
>  include/drm/i915_pciids.h       | 37 +++++++++++++++++++++++----------
>  2 files changed, 30 insertions(+), 12 deletions(-)
>

Apart from the first commit that's already in 4.18, these seem fine to
enable extra support with the new PCI-IDs. So please ignore first commit
when applying.

Acked-by: Colin Ian King <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED: [cosmic][PATCH 0/4] drm/i915: Add missing pci-id's, and platform definitions for WHL & AML

Seth Forshee
In reply to this post by Timo Aaltonen-6
On Wed, Sep 05, 2018 at 12:40:08PM +0300, Timo Aaltonen wrote:
> From: Timo Aaltonen <[hidden email]>
>
> BugLink: http://bugs.launchpad.net/bugs/1789924
>
> One commit backported from 4.20 queue, others cherry-picked from 4.18/4.19.

Applied patches 2-4 to cosmic/master-next. One small nit thought:

(cherry picked from drm-intel-next commit d0e062ebb3a44b56a7e672da568334c76f763552)

In cases like these please put the source repo "drm-intel-next" after
the sha1. We have tools that parse commit logs looking for these
strings, and sticking the source before the sha1 breaks the pattern
matchng. I fixed that up when applying.

Thanks!

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team