[Intel-gfx] [PATCH v2 1/2] drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping

[Intel-gfx] [PATCH v2 1/2] drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping

[Aditya Swarup]

Fix TGL REVID macros to fetch correct display/gt stepping based
on SOC rev id from INTEL_REVID() macro. Previously, we were just
returning the first element of the revid array instead of using
the correct index based on SOC rev id.

Fixes: ("drm/i915/tgl: Fix stepping WA matching")
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index fc1090c6889c..2e2149c9a2f4 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1580,9 +1580,9 @@ static inline const struct i915_rev_steppings *
 tgl_revids_get(struct drm_i915_private *dev_priv)
 {
 	if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv))
-		return tgl_uy_revids;
+		return &tgl_uy_revids[INTEL_REVID(dev_priv)];
 	else
-		return tgl_revids;
+		return &tgl_revids[INTEL_REVID(dev_priv)];
 }
 
 #define IS_TGL_DISP_REVID(p, since, until) \
@@ -1592,14 +1592,14 @@ tgl_revids_get(struct drm_i915_private *dev_priv)
 
 #define IS_TGL_UY_GT_REVID(p, since, until) \
 	((IS_TGL_U(p) || IS_TGL_Y(p)) && \
-	 tgl_uy_revids->gt_stepping >= (since) && \
-	 tgl_uy_revids->gt_stepping <= (until))
+	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
+	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping <= (until))
 
 #define IS_TGL_GT_REVID(p, since, until) \
 	(IS_TIGERLAKE(p) && \
 	 !(IS_TGL_U(p) || IS_TGL_Y(p)) && \
-	 tgl_revids->gt_stepping >= (since) && \
-	 tgl_revids->gt_stepping <= (until))
+	 tgl_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
+	 tgl_revids[INTEL_REVID(p)].gt_stepping <= (until))
 
 #define RKL_REVID_A0		0x0
 #define RKL_REVID_B0		0x1
-- 
2.27.0

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

[Intel-gfx] [PATCH v2 2/2] drm/i915/tgl: Add bound checks and simplify TGL REVID macros

[Aditya Swarup]

Add bound checks for TGL REV ID array. Since, there might
be a possibility of using older kernels on latest platform
revisions, resulting in out of bounds access for rev ID array.
In this scenario, use the latest rev ID available and apply
those WAs.

Also, simplify GT macros for TGL rev ID to reuse tgl_revids_get().

Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h | 34 +++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 2e2149c9a2f4..37c2df19ce52 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1573,16 +1573,30 @@ enum {
 	TGL_REVID_D0,
 };
 
-extern const struct i915_rev_steppings tgl_uy_revids[];
-extern const struct i915_rev_steppings tgl_revids[];
+#define TGL_UY_REVIDS_SIZE	4
+#define TGL_REVIDS_SIZE		2
+
+extern const struct i915_rev_steppings tgl_uy_revids[TGL_UY_REVIDS_SIZE];
+extern const struct i915_rev_steppings tgl_revids[TGL_REVIDS_SIZE];
 
 static inline const struct i915_rev_steppings *
 tgl_revids_get(struct drm_i915_private *dev_priv)
 {
-	if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv))
-		return &tgl_uy_revids[INTEL_REVID(dev_priv)];
-	else
-		return &tgl_revids[INTEL_REVID(dev_priv)];
+	u8 revid = INTEL_REVID(dev_priv);
+	u8 size;
+	const struct i915_rev_steppings *tgl_revid_tbl;
+
+	if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) {
+		tgl_revid_tbl = tgl_uy_revids;
+		size = ARRAY_SIZE(tgl_uy_revids);
+	} else {
+		tgl_revid_tbl = tgl_revids;
+		size = ARRAY_SIZE(tgl_revids);
+	}
+
+	revid = min_t(u8, revid, size - 1);
+
+	return &tgl_revid_tbl[revid];
 }
 
 #define IS_TGL_DISP_REVID(p, since, until) \
@@ -1592,14 +1606,14 @@ tgl_revids_get(struct drm_i915_private *dev_priv)
 
 #define IS_TGL_UY_GT_REVID(p, since, until) \
 	((IS_TGL_U(p) || IS_TGL_Y(p)) && \
-	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
-	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping <= (until))
+	 tgl_revids_get(p)->gt_stepping >= (since) && \
+	 tgl_revids_get(p)->gt_stepping <= (until))
 
 #define IS_TGL_GT_REVID(p, since, until) \
 	(IS_TIGERLAKE(p) && \
 	 !(IS_TGL_U(p) || IS_TGL_Y(p)) && \
-	 tgl_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
-	 tgl_revids[INTEL_REVID(p)].gt_stepping <= (until))
+	 tgl_revids_get(p)->gt_stepping >= (since) && \
+	 tgl_revids_get(p)->gt_stepping <= (until))
 
 #define RKL_REVID_A0		0x0
 #define RKL_REVID_B0		0x1
-- 
2.27.0

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

[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [v2,1/2] drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping

[Patchwork]

[-- Attachment #1.1: Type: text/plain, Size: 2892 bytes --]

== Series Details ==

Series: series starting with [v2,1/2] drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping
URL   : https://patchwork.freedesktop.org/series/84518/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_9430 -> Patchwork_19047
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/index.html

New tests
---------

  New tests have been introduced between CI_DRM_9430 and Patchwork_19047:

### New CI tests (1) ###

  * boot:
    - Statuses : 1 fail(s) 40 pass(s)
    - Exec time: [0.0] s

  

Known issues
------------

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

### IGT changes ###

#### Issues hit ####

  * igt@vgem_basic@setversion:
    - fi-tgl-y:           [PASS][1] -> [DMESG-WARN][2] ([i915#402]) +2 similar issues
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/fi-tgl-y/igt@vgem_basic@setversion.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/fi-tgl-y/igt@vgem_basic@setversion.html

  
#### Possible fixes ####

  * igt@core_hotunplug@unbind-rebind:
    - fi-kbl-7500u:       [DMESG-WARN][3] ([i915#2605]) -> [PASS][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/fi-kbl-7500u/igt@core_hotunplug@unbind-rebind.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/fi-kbl-7500u/igt@core_hotunplug@unbind-rebind.html

  * igt@prime_self_import@basic-with_one_bo_two_files:
    - fi-tgl-y:           [DMESG-WARN][5] ([i915#402]) -> [PASS][6] +1 similar issue
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html

  
  [i915#2605]: https://gitlab.freedesktop.org/drm/intel/issues/2605
  [i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402


Participating hosts (42 -> 41)
------------------------------

  Additional (2): fi-blb-e6850 fi-tgl-dsi 
  Missing    (3): fi-ilk-m540 fi-bdw-samus fi-hsw-4200u 


Build changes
-------------

  * Linux: CI_DRM_9430 -> Patchwork_19047

  CI-20190529: 20190529
  CI_DRM_9430: 88c5c7135da4f61235fe3dbf4a67b2121b893fca @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5878: e96c0d8e6952d892bcbbcdf004999880a4dfb42e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_19047: ff2abc96943168dc25c22b94db3e95b26899979d @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

ff2abc969431 drm/i915/tgl: Add bound checks and simplify TGL REVID macros
6a9d88264aa2 drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/index.html

[-- Attachment #1.2: Type: text/html, Size: 3658 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

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

[Intel-gfx] ✓ Fi.CI.IGT: success for series starting with [v2,1/2] drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping

[Patchwork]

[-- Attachment #1.1: Type: text/plain, Size: 12758 bytes --]

== Series Details ==

Series: series starting with [v2,1/2] drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping
URL   : https://patchwork.freedesktop.org/series/84518/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_9430_full -> Patchwork_19047_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  

New tests
---------

  New tests have been introduced between CI_DRM_9430_full and Patchwork_19047_full:

### New CI tests (1) ###

  * boot:
    - Statuses : 175 pass(s)
    - Exec time: [0.0] s

  

Known issues
------------

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_exec_gttfill@engines@rcs0:
    - shard-glk:          [PASS][1] -> [DMESG-WARN][2] ([i915#118] / [i915#95]) +1 similar issue
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-glk2/igt@gem_exec_gttfill@engines@rcs0.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-glk8/igt@gem_exec_gttfill@engines@rcs0.html

  * igt@kms_cursor_crc@pipe-c-cursor-128x128-offscreen:
    - shard-skl:          [PASS][3] -> [FAIL][4] ([i915#54]) +2 similar issues
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-skl6/igt@kms_cursor_crc@pipe-c-cursor-128x128-offscreen.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-skl9/igt@kms_cursor_crc@pipe-c-cursor-128x128-offscreen.html

  * igt@kms_flip@flip-vs-expired-vblank@a-edp1:
    - shard-tglb:         [PASS][5] -> [FAIL][6] ([i915#2598])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-tglb7/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-tglb6/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html

  * igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2:
    - shard-glk:          [PASS][7] -> [FAIL][8] ([i915#79])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-glk6/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-glk8/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2.html

  * igt@kms_flip@flip-vs-suspend@b-edp1:
    - shard-skl:          [PASS][9] -> [INCOMPLETE][10] ([i915#198])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-skl1/igt@kms_flip@flip-vs-suspend@b-edp1.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-skl6/igt@kms_flip@flip-vs-suspend@b-edp1.html

  * igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1:
    - shard-skl:          [PASS][11] -> [FAIL][12] ([i915#2122]) +1 similar issue
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-skl3/igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-skl4/igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1.html

  * igt@kms_hdr@bpc-switch-dpms:
    - shard-skl:          [PASS][13] -> [FAIL][14] ([i915#1188]) +1 similar issue
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-skl10/igt@kms_hdr@bpc-switch-dpms.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-skl7/igt@kms_hdr@bpc-switch-dpms.html

  * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
    - shard-kbl:          [PASS][15] -> [INCOMPLETE][16] ([i915#155] / [i915#180])
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-kbl2/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-kbl1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c.html

  * igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
    - shard-skl:          [PASS][17] -> [FAIL][18] ([fdo#108145] / [i915#265]) +1 similar issue
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-skl7/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html

  * igt@kms_psr@psr2_sprite_plane_move:
    - shard-iclb:         [PASS][19] -> [SKIP][20] ([fdo#109441]) +1 similar issue
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-iclb3/igt@kms_psr@psr2_sprite_plane_move.html

  
#### Possible fixes ####

  * igt@gem_exec_reloc@basic-many-active@rcs0:
    - shard-apl:          [FAIL][21] ([i915#2389]) -> [PASS][22]
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-apl7/igt@gem_exec_reloc@basic-many-active@rcs0.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-apl3/igt@gem_exec_reloc@basic-many-active@rcs0.html

  * igt@kms_atomic_transition@plane-all-transition-nonblocking-fencing@edp-1-pipe-d:
    - shard-tglb:         [INCOMPLETE][23] -> [PASS][24]
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-tglb6/igt@kms_atomic_transition@plane-all-transition-nonblocking-fencing@edp-1-pipe-d.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-tglb5/igt@kms_atomic_transition@plane-all-transition-nonblocking-fencing@edp-1-pipe-d.html

  * igt@kms_color@pipe-a-ctm-0-75:
    - shard-skl:          [DMESG-WARN][25] ([i915#1982]) -> [PASS][26]
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-skl3/igt@kms_color@pipe-a-ctm-0-75.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-skl4/igt@kms_color@pipe-a-ctm-0-75.html

  * igt@kms_cursor_crc@pipe-b-cursor-128x128-random:
    - shard-skl:          [FAIL][27] ([i915#54]) -> [PASS][28] +6 similar issues
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-skl7/igt@kms_cursor_crc@pipe-b-cursor-128x128-random.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-skl9/igt@kms_cursor_crc@pipe-b-cursor-128x128-random.html

  * igt@kms_cursor_crc@pipe-b-cursor-suspend:
    - shard-skl:          [INCOMPLETE][29] ([i915#2405] / [i915#300]) -> [PASS][30]
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-skl9/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-skl5/igt@kms_cursor_crc@pipe-b-cursor-suspend.html

  * igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
    - shard-skl:          [FAIL][31] ([i915#79]) -> [PASS][32] +1 similar issue
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-skl3/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-skl4/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html

  * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
    - shard-skl:          [FAIL][33] ([fdo#108145] / [i915#265]) -> [PASS][34]
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-skl1/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html

  * igt@kms_plane_lowres@pipe-c-tiling-y:
    - shard-kbl:          [DMESG-WARN][35] ([i915#165] / [i915#180] / [i915#78]) -> [PASS][36]
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-kbl2/igt@kms_plane_lowres@pipe-c-tiling-y.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-kbl7/igt@kms_plane_lowres@pipe-c-tiling-y.html

  * igt@kms_psr@psr2_cursor_render:
    - shard-iclb:         [SKIP][37] ([fdo#109441]) -> [PASS][38] +2 similar issues
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-iclb7/igt@kms_psr@psr2_cursor_render.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-iclb2/igt@kms_psr@psr2_cursor_render.html

  * igt@perf@blocking:
    - shard-skl:          [FAIL][39] ([i915#1542]) -> [PASS][40]
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-skl9/igt@perf@blocking.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-skl5/igt@perf@blocking.html

  
#### Warnings ####

  * igt@i915_pm_dc@dc3co-vpb-simulation:
    - shard-iclb:         [SKIP][41] ([i915#658]) -> [SKIP][42] ([i915#588])
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-iclb7/igt@i915_pm_dc@dc3co-vpb-simulation.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html

  * igt@i915_pm_rc6_residency@rc6-fence:
    - shard-iclb:         [WARN][43] ([i915#1804] / [i915#2684]) -> [WARN][44] ([i915#2684])
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-iclb6/igt@i915_pm_rc6_residency@rc6-fence.html
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-iclb5/igt@i915_pm_rc6_residency@rc6-fence.html

  * igt@kms_dp_dsc@basic-dsc-enable-edp:
    - shard-iclb:         [SKIP][45] ([fdo#109349]) -> [DMESG-WARN][46] ([i915#1226])
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-iclb4/igt@kms_dp_dsc@basic-dsc-enable-edp.html
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html

  * igt@runner@aborted:
    - shard-kbl:          [FAIL][47] ([i915#2295] / [i915#2722]) -> ([FAIL][48], [FAIL][49]) ([i915#1814] / [i915#2295] / [i915#2722] / [i915#483])
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9430/shard-kbl7/igt@runner@aborted.html
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-kbl1/igt@runner@aborted.html
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19047/shard-kbl1/igt@runner@aborted.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
  [fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
  [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
  [i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
  [i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
  [i915#1226]: https://gitlab.freedesktop.org/drm/intel/issues/1226
  [i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
  [i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
  [i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
  [i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
  [i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
  [i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
  [i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
  [i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
  [i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
  [i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
  [i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
  [i915#2405]: https://gitlab.freedesktop.org/drm/intel/issues/2405
  [i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
  [i915#2598]: https://gitlab.freedesktop.org/drm/intel/issues/2598
  [i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
  [i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
  [i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
  [i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
  [i915#483]: https://gitlab.freedesktop.org/drm/intel/issues/483
  [i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
  [i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
  [i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
  [i915#78]: https://gitlab.freedesktop.org/drm/intel/issues/78
  [i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
  [i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95


Participating hosts (10 -> 10)
------------------------------

  No changes in participating hosts


Build changes
-------------

  * Linux: CI_DRM_9430 -> Patchwork_19047

  CI-20190529: 20190529
  CI_DRM_9430: 88c5c7135da4f61235fe3dbf4a67b2121b893fca @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5878: e96c0d8e6952d892bcbbcdf004999880a4dfb42e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_19047: ff2abc96943168dc25c22b94db3e95b26899979d @ 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_19047/index.html

[-- Attachment #1.2: Type: text/html, Size: 14492 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

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

Re: [Intel-gfx] [PATCH v2 1/2] drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping

[Lucas De Marchi]

Both patches applied. Thanks!

Jani, maybe now you can rebase your patch to get rid of the extern ?


Lucas De Marchi

On Wed, Dec 02, 2020 at 11:23:58PM -0800, Aditya Swarup wrote:
>Fix TGL REVID macros to fetch correct display/gt stepping based
>on SOC rev id from INTEL_REVID() macro. Previously, we were just
>returning the first element of the revid array instead of using
>the correct index based on SOC rev id.
>
>Fixes: ("drm/i915/tgl: Fix stepping WA matching")
>Cc: José Roberto de Souza <jose.souza@intel.com>
>Cc: Matt Roper <matthew.d.roper@intel.com>
>Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>Cc: Jani Nikula <jani.nikula@intel.com>
>Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
>Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>---
> drivers/gpu/drm/i915/i915_drv.h | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index fc1090c6889c..2e2149c9a2f4 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -1580,9 +1580,9 @@ static inline const struct i915_rev_steppings *
> tgl_revids_get(struct drm_i915_private *dev_priv)
> {
> 	if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv))
>-		return tgl_uy_revids;
>+		return &tgl_uy_revids[INTEL_REVID(dev_priv)];
> 	else
>-		return tgl_revids;
>+		return &tgl_revids[INTEL_REVID(dev_priv)];
> }
>
> #define IS_TGL_DISP_REVID(p, since, until) \
>@@ -1592,14 +1592,14 @@ tgl_revids_get(struct drm_i915_private *dev_priv)
>
> #define IS_TGL_UY_GT_REVID(p, since, until) \
> 	((IS_TGL_U(p) || IS_TGL_Y(p)) && \
>-	 tgl_uy_revids->gt_stepping >= (since) && \
>-	 tgl_uy_revids->gt_stepping <= (until))
>+	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
>+	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping <= (until))
>
> #define IS_TGL_GT_REVID(p, since, until) \
> 	(IS_TIGERLAKE(p) && \
> 	 !(IS_TGL_U(p) || IS_TGL_Y(p)) && \
>-	 tgl_revids->gt_stepping >= (since) && \
>-	 tgl_revids->gt_stepping <= (until))
>+	 tgl_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
>+	 tgl_revids[INTEL_REVID(p)].gt_stepping <= (until))
>
> #define RKL_REVID_A0		0x0
> #define RKL_REVID_B0		0x1
>-- 
>2.27.0
>
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v2 1/2] drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping

[Jani Nikula]

On Thu, 17 Dec 2020, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> Both patches applied. Thanks!
>
> Jani, maybe now you can rebase your patch to get rid of the extern ?

Yes, thanks for the irq so I can stop polling. ;)

BR,
Jani.


>
>
> Lucas De Marchi
>
> On Wed, Dec 02, 2020 at 11:23:58PM -0800, Aditya Swarup wrote:
>>Fix TGL REVID macros to fetch correct display/gt stepping based
>>on SOC rev id from INTEL_REVID() macro. Previously, we were just
>>returning the first element of the revid array instead of using
>>the correct index based on SOC rev id.
>>
>>Fixes: ("drm/i915/tgl: Fix stepping WA matching")
>>Cc: José Roberto de Souza <jose.souza@intel.com>
>>Cc: Matt Roper <matthew.d.roper@intel.com>
>>Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>>Cc: Jani Nikula <jani.nikula@intel.com>
>>Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
>>Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>>---
>> drivers/gpu/drm/i915/i915_drv.h | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>>index fc1090c6889c..2e2149c9a2f4 100644
>>--- a/drivers/gpu/drm/i915/i915_drv.h
>>+++ b/drivers/gpu/drm/i915/i915_drv.h
>>@@ -1580,9 +1580,9 @@ static inline const struct i915_rev_steppings *
>> tgl_revids_get(struct drm_i915_private *dev_priv)
>> {
>> 	if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv))
>>-		return tgl_uy_revids;
>>+		return &tgl_uy_revids[INTEL_REVID(dev_priv)];
>> 	else
>>-		return tgl_revids;
>>+		return &tgl_revids[INTEL_REVID(dev_priv)];
>> }
>>
>> #define IS_TGL_DISP_REVID(p, since, until) \
>>@@ -1592,14 +1592,14 @@ tgl_revids_get(struct drm_i915_private *dev_priv)
>>
>> #define IS_TGL_UY_GT_REVID(p, since, until) \
>> 	((IS_TGL_U(p) || IS_TGL_Y(p)) && \
>>-	 tgl_uy_revids->gt_stepping >= (since) && \
>>-	 tgl_uy_revids->gt_stepping <= (until))
>>+	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
>>+	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping <= (until))
>>
>> #define IS_TGL_GT_REVID(p, since, until) \
>> 	(IS_TIGERLAKE(p) && \
>> 	 !(IS_TGL_U(p) || IS_TGL_Y(p)) && \
>>-	 tgl_revids->gt_stepping >= (since) && \
>>-	 tgl_revids->gt_stepping <= (until))
>>+	 tgl_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
>>+	 tgl_revids[INTEL_REVID(p)].gt_stepping <= (until))
>>
>> #define RKL_REVID_A0		0x0
>> #define RKL_REVID_B0		0x1
>>-- 
>>2.27.0
>>
>>_______________________________________________
>>Intel-gfx mailing list
>>Intel-gfx@lists.freedesktop.org
>>https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v2 1/2] drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping

[Jani Nikula]

On Fri, 18 Dec 2020, Jani Nikula <jani.nikula@intel.com> wrote:
> On Thu, 17 Dec 2020, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>> Both patches applied. Thanks!
>>
>> Jani, maybe now you can rebase your patch to get rid of the extern ?
>
> Yes, thanks for the irq so I can stop polling. ;)

Huh, why were these applied to drm-intel-gt-next? It's much more about
driver core code than gt.

BR,
Jani.


>
> BR,
> Jani.
>
>
>>
>>
>> Lucas De Marchi
>>
>> On Wed, Dec 02, 2020 at 11:23:58PM -0800, Aditya Swarup wrote:
>>>Fix TGL REVID macros to fetch correct display/gt stepping based
>>>on SOC rev id from INTEL_REVID() macro. Previously, we were just
>>>returning the first element of the revid array instead of using
>>>the correct index based on SOC rev id.
>>>
>>>Fixes: ("drm/i915/tgl: Fix stepping WA matching")
>>>Cc: José Roberto de Souza <jose.souza@intel.com>
>>>Cc: Matt Roper <matthew.d.roper@intel.com>
>>>Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>>>Cc: Jani Nikula <jani.nikula@intel.com>
>>>Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>>Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
>>>Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>>>---
>>> drivers/gpu/drm/i915/i915_drv.h | 12 ++++++------
>>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>>
>>>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>>>index fc1090c6889c..2e2149c9a2f4 100644
>>>--- a/drivers/gpu/drm/i915/i915_drv.h
>>>+++ b/drivers/gpu/drm/i915/i915_drv.h
>>>@@ -1580,9 +1580,9 @@ static inline const struct i915_rev_steppings *
>>> tgl_revids_get(struct drm_i915_private *dev_priv)
>>> {
>>> 	if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv))
>>>-		return tgl_uy_revids;
>>>+		return &tgl_uy_revids[INTEL_REVID(dev_priv)];
>>> 	else
>>>-		return tgl_revids;
>>>+		return &tgl_revids[INTEL_REVID(dev_priv)];
>>> }
>>>
>>> #define IS_TGL_DISP_REVID(p, since, until) \
>>>@@ -1592,14 +1592,14 @@ tgl_revids_get(struct drm_i915_private *dev_priv)
>>>
>>> #define IS_TGL_UY_GT_REVID(p, since, until) \
>>> 	((IS_TGL_U(p) || IS_TGL_Y(p)) && \
>>>-	 tgl_uy_revids->gt_stepping >= (since) && \
>>>-	 tgl_uy_revids->gt_stepping <= (until))
>>>+	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
>>>+	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping <= (until))
>>>
>>> #define IS_TGL_GT_REVID(p, since, until) \
>>> 	(IS_TIGERLAKE(p) && \
>>> 	 !(IS_TGL_U(p) || IS_TGL_Y(p)) && \
>>>-	 tgl_revids->gt_stepping >= (since) && \
>>>-	 tgl_revids->gt_stepping <= (until))
>>>+	 tgl_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
>>>+	 tgl_revids[INTEL_REVID(p)].gt_stepping <= (until))
>>>
>>> #define RKL_REVID_A0		0x0
>>> #define RKL_REVID_B0		0x1
>>>-- 
>>>2.27.0
>>>
>>>_______________________________________________
>>>Intel-gfx mailing list
>>>Intel-gfx@lists.freedesktop.org
>>>https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v2 1/2] drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping

[Lucas De Marchi]

On Fri, Dec 18, 2020 at 01:13:49PM +0200, Jani Nikula wrote:
>On Fri, 18 Dec 2020, Jani Nikula <jani.nikula@intel.com> wrote:
>> On Thu, 17 Dec 2020, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>>> Both patches applied. Thanks!
>>>
>>> Jani, maybe now you can rebase your patch to get rid of the extern ?
>>
>> Yes, thanks for the irq so I can stop polling. ;)
>
>Huh, why were these applied to drm-intel-gt-next? It's much more about
>driver core code than gt.

sigh... by mistake. At the time as was mainly thinking about the WAs
that are affected by these and thought it would belong to gt.

what now? Do we apply in to drm-intel-next as well or wait for a backmerge?

sorry,

Lucas De Marchi

>
>BR,
>Jani.
>
>
>>
>> BR,
>> Jani.
>>
>>
>>>
>>>
>>> Lucas De Marchi
>>>
>>> On Wed, Dec 02, 2020 at 11:23:58PM -0800, Aditya Swarup wrote:
>>>>Fix TGL REVID macros to fetch correct display/gt stepping based
>>>>on SOC rev id from INTEL_REVID() macro. Previously, we were just
>>>>returning the first element of the revid array instead of using
>>>>the correct index based on SOC rev id.
>>>>
>>>>Fixes: ("drm/i915/tgl: Fix stepping WA matching")
>>>>Cc: José Roberto de Souza <jose.souza@intel.com>
>>>>Cc: Matt Roper <matthew.d.roper@intel.com>
>>>>Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>>>>Cc: Jani Nikula <jani.nikula@intel.com>
>>>>Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>>>Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
>>>>Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>>>>---
>>>> drivers/gpu/drm/i915/i915_drv.h | 12 ++++++------
>>>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>>>
>>>>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>>>>index fc1090c6889c..2e2149c9a2f4 100644
>>>>--- a/drivers/gpu/drm/i915/i915_drv.h
>>>>+++ b/drivers/gpu/drm/i915/i915_drv.h
>>>>@@ -1580,9 +1580,9 @@ static inline const struct i915_rev_steppings *
>>>> tgl_revids_get(struct drm_i915_private *dev_priv)
>>>> {
>>>> 	if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv))
>>>>-		return tgl_uy_revids;
>>>>+		return &tgl_uy_revids[INTEL_REVID(dev_priv)];
>>>> 	else
>>>>-		return tgl_revids;
>>>>+		return &tgl_revids[INTEL_REVID(dev_priv)];
>>>> }
>>>>
>>>> #define IS_TGL_DISP_REVID(p, since, until) \
>>>>@@ -1592,14 +1592,14 @@ tgl_revids_get(struct drm_i915_private *dev_priv)
>>>>
>>>> #define IS_TGL_UY_GT_REVID(p, since, until) \
>>>> 	((IS_TGL_U(p) || IS_TGL_Y(p)) && \
>>>>-	 tgl_uy_revids->gt_stepping >= (since) && \
>>>>-	 tgl_uy_revids->gt_stepping <= (until))
>>>>+	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
>>>>+	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping <= (until))
>>>>
>>>> #define IS_TGL_GT_REVID(p, since, until) \
>>>> 	(IS_TIGERLAKE(p) && \
>>>> 	 !(IS_TGL_U(p) || IS_TGL_Y(p)) && \
>>>>-	 tgl_revids->gt_stepping >= (since) && \
>>>>-	 tgl_revids->gt_stepping <= (until))
>>>>+	 tgl_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
>>>>+	 tgl_revids[INTEL_REVID(p)].gt_stepping <= (until))
>>>>
>>>> #define RKL_REVID_A0		0x0
>>>> #define RKL_REVID_B0		0x1
>>>>--
>>>>2.27.0
>>>>
>>>>_______________________________________________
>>>>Intel-gfx mailing list
>>>>Intel-gfx@lists.freedesktop.org
>>>>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>-- 
>Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v2 1/2] drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping

[Jani Nikula]

On Fri, 18 Dec 2020, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Fri, Dec 18, 2020 at 01:13:49PM +0200, Jani Nikula wrote:
>>On Fri, 18 Dec 2020, Jani Nikula <jani.nikula@intel.com> wrote:
>>> On Thu, 17 Dec 2020, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>>>> Both patches applied. Thanks!
>>>>
>>>> Jani, maybe now you can rebase your patch to get rid of the extern ?
>>>
>>> Yes, thanks for the irq so I can stop polling. ;)
>>
>>Huh, why were these applied to drm-intel-gt-next? It's much more about
>>driver core code than gt.
>
> sigh... by mistake. At the time as was mainly thinking about the WAs
> that are affected by these and thought it would belong to gt.
>
> what now? Do we apply in to drm-intel-next as well or wait for a backmerge?

Maybe I'll do the refactoring in gt-next as well. Or wait for the
backmerge. *shrug*

Don't worry about it.

BR,
Jani.


>
> sorry,
>
> Lucas De Marchi
>
>>
>>BR,
>>Jani.
>>
>>
>>>
>>> BR,
>>> Jani.
>>>
>>>
>>>>
>>>>
>>>> Lucas De Marchi
>>>>
>>>> On Wed, Dec 02, 2020 at 11:23:58PM -0800, Aditya Swarup wrote:
>>>>>Fix TGL REVID macros to fetch correct display/gt stepping based
>>>>>on SOC rev id from INTEL_REVID() macro. Previously, we were just
>>>>>returning the first element of the revid array instead of using
>>>>>the correct index based on SOC rev id.
>>>>>
>>>>>Fixes: ("drm/i915/tgl: Fix stepping WA matching")
>>>>>Cc: José Roberto de Souza <jose.souza@intel.com>
>>>>>Cc: Matt Roper <matthew.d.roper@intel.com>
>>>>>Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>>>>>Cc: Jani Nikula <jani.nikula@intel.com>
>>>>>Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>>>>Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
>>>>>Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>>>>>---
>>>>> drivers/gpu/drm/i915/i915_drv.h | 12 ++++++------
>>>>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>>>>
>>>>>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>>>>>index fc1090c6889c..2e2149c9a2f4 100644
>>>>>--- a/drivers/gpu/drm/i915/i915_drv.h
>>>>>+++ b/drivers/gpu/drm/i915/i915_drv.h
>>>>>@@ -1580,9 +1580,9 @@ static inline const struct i915_rev_steppings *
>>>>> tgl_revids_get(struct drm_i915_private *dev_priv)
>>>>> {
>>>>> 	if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv))
>>>>>-		return tgl_uy_revids;
>>>>>+		return &tgl_uy_revids[INTEL_REVID(dev_priv)];
>>>>> 	else
>>>>>-		return tgl_revids;
>>>>>+		return &tgl_revids[INTEL_REVID(dev_priv)];
>>>>> }
>>>>>
>>>>> #define IS_TGL_DISP_REVID(p, since, until) \
>>>>>@@ -1592,14 +1592,14 @@ tgl_revids_get(struct drm_i915_private *dev_priv)
>>>>>
>>>>> #define IS_TGL_UY_GT_REVID(p, since, until) \
>>>>> 	((IS_TGL_U(p) || IS_TGL_Y(p)) && \
>>>>>-	 tgl_uy_revids->gt_stepping >= (since) && \
>>>>>-	 tgl_uy_revids->gt_stepping <= (until))
>>>>>+	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
>>>>>+	 tgl_uy_revids[INTEL_REVID(p)].gt_stepping <= (until))
>>>>>
>>>>> #define IS_TGL_GT_REVID(p, since, until) \
>>>>> 	(IS_TIGERLAKE(p) && \
>>>>> 	 !(IS_TGL_U(p) || IS_TGL_Y(p)) && \
>>>>>-	 tgl_revids->gt_stepping >= (since) && \
>>>>>-	 tgl_revids->gt_stepping <= (until))
>>>>>+	 tgl_revids[INTEL_REVID(p)].gt_stepping >= (since) && \
>>>>>+	 tgl_revids[INTEL_REVID(p)].gt_stepping <= (until))
>>>>>
>>>>> #define RKL_REVID_A0		0x0
>>>>> #define RKL_REVID_B0		0x1
>>>>>--
>>>>>2.27.0
>>>>>
>>>>>_______________________________________________
>>>>>Intel-gfx mailing list
>>>>>Intel-gfx@lists.freedesktop.org
>>>>>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>
>>-- 
>>Jani Nikula, Intel Open Source Graphics Center

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx