Skip to contentSkip to conversation

drm/i915: Redefine some Whiskey Lake SKUs

PATCH In review Rodrigo Vivi 3 participants 5 messages Sep 24, 2018 – Oct 5, 2018 DRM drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Redefine some Whiskey Lake SKUs

commit 'b9be78531d27 ("drm/i915/whl: Introducing Whiskey Lake platform")' introduced WHL by moving some of CFL IDs here and using the Spec information of "U43" for most of IDs what appeared to be GT3.

However when propagating the change to Mesa, Lionel noticed that based on number of execution unities the classification here seems at least strange.

So, let's move for now with the information we trust more:
the number of EUs. So we are able to propagate this change across the stack without getting stuck forever.

Reference: https://patchwork.freedesktop.org/patch/246695/

Fixes b9be78531d27 ("drm/i915/whl: Introducing Whiskey Lake platform")
Cc Lionel Landwerlin <[email protected]>
Cc José Roberto de Souza <[email protected]>
Cc David Airlie <[email protected]>
---
 include/drm/i915_pciids.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
include/drm/i915_pciids.h +5 -5
index fd965ffbb92e..c8d3d541ad01 100644
@@ -407,17 +407,17 @@
 
 /* WHL/CFL U GT1 */
 #define INTEL_WHL_U_GT1_IDS(info) \
-	INTEL_VGA_DEVICE(0x3EA1, info)
+	INTEL_VGA_DEVICE(0x3EA1, info), \
+	INTEL_VGA_DEVICE(0x3EA4, info)
 
 /* WHL/CFL U GT2 */
 #define INTEL_WHL_U_GT2_IDS(info) \
-	INTEL_VGA_DEVICE(0x3EA0, info)
+	INTEL_VGA_DEVICE(0x3EA0, info), \
+	INTEL_VGA_DEVICE(0x3EA3, 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)
+	INTEL_VGA_DEVICE(0x3EA2, info)
 
 #define INTEL_CFL_IDS(info)	   \
 	INTEL_CFL_S_GT1_IDS(info), \
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for drm/i915: Redefine some Whiskey Lake SKUs

== Series Details ==

== Series Details ==

Series: drm/i915: Redefine some Whiskey Lake SKUs
URL : https://patchwork.freedesktop.org/series/50114/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4869 -> Patchwork_10267 =

== Summary - SUCCESS ==

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/50114/revisions/1/mbox/

== Known issues ==

Here are the changes found in Patchwork_10267 that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@gem_exec_suspend@basic-s3:
      fi-blb-e6850:       PASS -> INCOMPLETE (fdo#107718)

    igt@gem_exec_suspend@basic-s4-devices:
      fi-bdw-samus:       PASS -> INCOMPLETE (fdo#107773)

    igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence:
      fi-byt-clapper:     PASS -> FAIL (fdo#103191, fdo#107362)

    igt@kms_psr@primary_page_flip:
      fi-cfl-s3:          PASS -> FAIL (fdo#107336)

    
    ==== Possible fixes ====

    igt@drv_selftest@live_hangcheck:
      fi-kbl-7560u:       INCOMPLETE (fdo#108044) -> PASS

    igt@kms_frontbuffer_tracking@basic:
      fi-hsw-peppy:       DMESG-WARN (fdo#102614) -> PASS

    igt@pm_rpm@module-reload:
      fi-skl-caroline:    INCOMPLETE (fdo#107807) -> PASS

fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#107336 https://bugs.freedesktop.org/show_bug.cgi?id=107336
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#108044 https://bugs.freedesktop.org/show_bug.cgi?id=108044

== Participating hosts (46 -> 42) ==

Additional (1): fi-skl-guc
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u

== Build changes ==

* Linux: CI_DRM_4869 -> Patchwork_10267

CI_DRM_4869: 9a74a6db272a007c3db063ae3375fbee60a7bd53 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4649: 19b0c74d20d9b53d4c82be14af0909a3b6846010 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10267: 94a4f7e2f915707ce5042bc82a3eb2bb1f47e091 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

94a4f7e2f915 drm/i915: Redefine some Whiskey Lake SKUs

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10267/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✓ Fi.CI.IGT: success for drm/i915: Redefine some Whiskey Lake SKUs

In reply to Rodrigo Vivi
== Series Details ==

== Series Details ==

Series: drm/i915: Redefine some Whiskey Lake SKUs
URL : https://patchwork.freedesktop.org/series/50114/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4869_full -> Patchwork_10267_full =

== Summary - WARNING ==

Minor unknown changes coming with Patchwork_10267_full need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_10267_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

== Possible new issues ==

Here are the unknown changes that may have been introduced in Patchwork_10267_full:

=== IGT changes ===

    ==== Warnings ====

    igt@kms_cursor_crc@cursor-256x256-random:
      shard-snb:          PASS -> SKIP

    igt@pm_rc6_residency@rc6-accuracy:
      shard-kbl:          SKIP -> PASS +1

== Known issues ==

Here are the changes found in Patchwork_10267_full that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@gem_exec_await@wide-contexts:
      shard-kbl:          PASS -> FAIL (fdo#106680)

    igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
      shard-snb:          NOTRUN -> DMESG-WARN (fdo#107956)

    igt@kms_setmode@basic:
      shard-snb:          NOTRUN -> FAIL (fdo#99912)

    
    ==== Possible fixes ====

    igt@gem_exec_schedule@smoketest-render:
      shard-snb:          INCOMPLETE (fdo#105411) -> SKIP

    igt@kms_atomic_transition@1x-modeset-transitions-nonblocking:
      shard-apl:          DMESG-WARN (fdo#103558, fdo#105602) -> PASS +12

    igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
      shard-hsw:          DMESG-WARN (fdo#107956) -> PASS

    igt@kms_flip@2x-flip-vs-expired-vblank:
      shard-glk:          FAIL (fdo#105363) -> PASS

    igt@kms_setmode@basic:
      shard-apl:          FAIL (fdo#99912) -> PASS

fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#106680 https://bugs.freedesktop.org/show_bug.cgi?id=106680
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912

== Participating hosts (5 -> 5) ==

No changes in participating hosts

== Build changes ==

* Linux: CI_DRM_4869 -> Patchwork_10267

CI_DRM_4869: 9a74a6db272a007c3db063ae3375fbee60a7bd53 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4649: 19b0c74d20d9b53d4c82be14af0909a3b6846010 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10267: 94a4f7e2f915707ce5042bc82a3eb2bb1f47e091 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10267/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#3 lore raw
In reply to Rodrigo Vivi
Quoted 9 lines · Rodrigo Vivi

commit 'b9be78531d27 ("drm/i915/whl: Introducing Whiskey Lake platform")' introduced WHL by moving some of CFL IDs here and using the Spec information of "U43" for most of IDs what appeared to be GT3.

However when propagating the change to Mesa, Lionel noticed that based on number of execution unities the classification here seems at least strange.

Quoted 8 lines

So, let's move for now with the information we trust more:
the number of EUs. So we are able to propagate this change across the stack without getting stuck forever.

Reference: https://patchwork.freedesktop.org/patch/246695/

Fixes b9be78531d27 ("drm/i915/whl: Introducing Whiskey Lake

platform")
Cc: Lionel Landwerlin <[email protected]>

By the EU number this looks right.

Quoted 24 lines
Cc José Roberto de Souza <[email protected]>
Cc David Airlie <[email protected]>
---
 include/drm/i915_pciids.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
include/drm/i915_pciids.h +4 -2
index fd965ffbb92e..c8d3d541ad01 100644
@@ -407,17 +407,17 @@
 
 /* WHL/CFL U GT1 */
 #define INTEL_WHL_U_GT1_IDS(info) \
-	INTEL_VGA_DEVICE(0x3EA1, info)
+	INTEL_VGA_DEVICE(0x3EA1, info), \
+	INTEL_VGA_DEVICE(0x3EA4, info)
 
 /* WHL/CFL U GT2 */
 #define INTEL_WHL_U_GT2_IDS(info) \
-	INTEL_VGA_DEVICE(0x3EA0, info)
+	INTEL_VGA_DEVICE(0x3EA0, info), \
+	INTEL_VGA_DEVICE(0x3EA3, info)

include/drm/i915_pciids.h line 423

Quoted 10 lines
include/drm/i915_pciids.h +1 -3
 
 /* 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)
+	INTEL_VGA_DEVICE(0x3EA2, info)
 
 #define INTEL_CFL_IDS(info)	   \
 	INTEL_CFL_S_GT1_IDS(info), \

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author Applied
#4 lore raw
Quoted 14 lines · Jose
Quoted 13 lines · Rodrigo Vivi

commit 'b9be78531d27 ("drm/i915/whl: Introducing Whiskey Lake platform")' introduced WHL by moving some of CFL IDs here and using the Spec information of "U43" for most of IDs what appeared to be GT3.

However when propagating the change to Mesa, Lionel noticed that based on number of execution unities the classification here seems at least strange.

So, let's move for now with the information we trust more:
the number of EUs. So we are able to propagate this change across the stack without getting stuck forever.

Quoted 7 lines
Quoted 4 lines

Reference: https://patchwork.freedesktop.org/patch/246695/

Fixes b9be78531d27 ("drm/i915/whl: Introducing Whiskey Lake

platform")
Cc: Lionel Landwerlin <[email protected]>

By the EU number this looks right.

pushed to dinq, thanks

Quoted 33 lines
Quoted 33 lines
Cc José Roberto de Souza <[email protected]>
Cc David Airlie <[email protected]>
---
 include/drm/i915_pciids.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
include/drm/i915_pciids.h +5 -5
index fd965ffbb92e..c8d3d541ad01 100644
@@ -407,17 +407,17 @@
 
 /* WHL/CFL U GT1 */
 #define INTEL_WHL_U_GT1_IDS(info) \
-	INTEL_VGA_DEVICE(0x3EA1, info)
+	INTEL_VGA_DEVICE(0x3EA1, info), \
+	INTEL_VGA_DEVICE(0x3EA4, info)
 
 /* WHL/CFL U GT2 */
 #define INTEL_WHL_U_GT2_IDS(info) \
-	INTEL_VGA_DEVICE(0x3EA0, info)
+	INTEL_VGA_DEVICE(0x3EA0, info), \
+	INTEL_VGA_DEVICE(0x3EA3, 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)
+	INTEL_VGA_DEVICE(0x3EA2, info)
 
Quoted 6 lines

include/drm/i915_pciids.h line 423

Quoted 2 lines
include/drm/i915_pciids.h +0 -0
 #define INTEL_CFL_IDS(info)	   \
 	INTEL_CFL_S_GT1_IDS(info), \

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx