diff mbox series

drm/i915: Revert 'guc_id' from i915_request tracepoint

Message ID 20211027093255.66489-1-joonas.lahtinen@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: Revert 'guc_id' from i915_request tracepoint | expand

Commit Message

Joonas Lahtinen Oct. 27, 2021, 9:32 a.m. UTC 
Avoid adding backend specific data to the tracepoints outside of
the LOW_LEVEL_TRACEPOINTS kernel config protection. These bits of
information are bound to change depending on the selected submission
method per platform and are not necessarily possible to maintain in
the future.

Fixes: dbf9da8d55ef ("drm/i915/guc: Add trace point for GuC submit")
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: John Harrison <john.c.harrison@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matt Roper <matthew.d.roper@intel.com>
---
 drivers/gpu/drm/i915/i915_trace.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Comments

Matthew Auld Oct. 27, 2021, 9:53 a.m. UTC | #1 
On Wed, 27 Oct 2021 at 10:33, Joonas Lahtinen
<joonas.lahtinen@linux.intel.com> wrote:
>
> Avoid adding backend specific data to the tracepoints outside of
> the LOW_LEVEL_TRACEPOINTS kernel config protection. These bits of
> information are bound to change depending on the selected submission
> method per platform and are not necessarily possible to maintain in
> the future.
>
> Fixes: dbf9da8d55ef ("drm/i915/guc: Add trace point for GuC submit")
> Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: John Harrison <john.c.harrison@intel.com>
> Cc: Matthew Brost <matthew.brost@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Joonas Lahtinen Oct. 27, 2021, 11:15 a.m. UTC | #2 
+ Jani and Rodrigo in order to pick this to -fixes.

Quoting Patchwork (2021-10-27 13:31:33)
> Patch Details
> 
> Series:  drm/i915: Revert 'guc_id' from i915_request tracepoint
> URL:     https://patchwork.freedesktop.org/series/96336/
> State:   success
> Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21458/index.html
> 
> CI Bug Log - changes from CI_DRM_10795 -> Patchwork_21458
> 
> Summary
> 
> SUCCESS
> 
> No regressions found.

Thanks for the review, this is now merged to drm-intel-gt-next.

Regards, Joonas

> External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21458/
> index.html
> 
> Participating hosts (37 -> 35)
> 
> Additional (2): fi-tgl-1115g4 fi-icl-u2
> Missing (4): fi-bsw-cyan bat-adlp-4 bat-dg1-6 bat-dg1-5
> 
> Known issues
> 
> Here are the changes found in Patchwork_21458 that come from known issues:
> 
> IGT changes
> 
> Issues hit
> 
>   • igt@amdgpu/amd_basic@query-info:
> 
>       □ fi-tgl-1115g4: NOTRUN -> SKIP (fdo#109315)
>   • igt@amdgpu/amd_cs_nop@fork-gfx0:
> 
>       □ fi-icl-u2: NOTRUN -> SKIP (fdo#109315) +17 similar issues
>   • igt@amdgpu/amd_cs_nop@nop-gfx0:
> 
>       □ fi-tgl-1115g4: NOTRUN -> SKIP (fdo#109315 / i915#2575) +16 similar
>         issues
>   • igt@gem_huc_copy@huc-copy:
> 
>       □ fi-tgl-1115g4: NOTRUN -> SKIP (i915#2190)
> 
>       □ fi-icl-u2: NOTRUN -> SKIP (i915#2190)
> 
>   • igt@i915_pm_backlight@basic-brightness:
> 
>       □ fi-tgl-1115g4: NOTRUN -> SKIP (i915#1155)
>   • igt@i915_selftest@live@execlists:
> 
>       □ fi-bsw-n3050: PASS -> INCOMPLETE (i915#2940)
>   • igt@kms_chamelium@common-hpd-after-suspend:
> 
>       □ fi-tgl-1115g4: NOTRUN -> SKIP (fdo#111827) +8 similar issues
>   • igt@kms_chamelium@dp-crc-fast:
> 
>       □ fi-bsw-nick: NOTRUN -> SKIP (fdo#109271 / fdo#111827) +8 similar issues
>   • igt@kms_chamelium@hdmi-hpd-fast:
> 
>       □ fi-icl-u2: NOTRUN -> SKIP (fdo#111827) +8 similar issues
>   • igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
> 
>       □ fi-tgl-1115g4: NOTRUN -> SKIP (i915#4103) +1 similar issue
>   • igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
> 
>       □ fi-icl-u2: NOTRUN -> SKIP (fdo#109278) +2 similar issues
>   • igt@kms_force_connector_basic@force-load-detect:
> 
>       □ fi-tgl-1115g4: NOTRUN -> SKIP (fdo#109285)
> 
>       □ fi-icl-u2: NOTRUN -> SKIP (fdo#109285)
> 
>   • igt@kms_psr@primary_mmap_gtt:
> 
>       □ fi-tgl-1115g4: NOTRUN -> SKIP (i915#1072) +3 similar issues
>   • igt@prime_vgem@basic-fence-flip:
> 
>       □ fi-bsw-nick: NOTRUN -> SKIP (fdo#109271) +57 similar issues
>   • igt@prime_vgem@basic-userptr:
> 
>       □ fi-icl-u2: NOTRUN -> SKIP (i915#3301)
> 
>       □ fi-tgl-1115g4: NOTRUN -> SKIP (i915#3301)
> 
>   • igt@runner@aborted:
> 
>       □ fi-bsw-n3050: NOTRUN -> FAIL (fdo#109271 / i915#1436 / i915#3428 / i915
>         #4312)
> 
> Possible fixes
> 
>   • igt@gem_exec_suspend@basic-s3:
> 
>       □ fi-bsw-nick: INCOMPLETE (i915#2369 / i915#3159) -> PASS
>   • igt@kms_frontbuffer_tracking@basic:
> 
>       □ fi-cfl-8109u: DMESG-FAIL (i915#295) -> PASS
>   • igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b:
> 
>       □ fi-cfl-8109u: DMESG-WARN (i915#295) -> PASS +10 similar issues
> 
> Build changes
> 
>   • Linux: CI_DRM_10795 -> Patchwork_21458
> 
> CI-20190529: 20190529
> CI_DRM_10795: 59f3569eebe53403249227d476e81d09c63c0f0c @ git://
> anongit.freedesktop.org/gfx-ci/linux
> IGT_6262: d1c793b26e31cc6ae3f9fa3239805a9bbcc749fb @ https://
> gitlab.freedesktop.org/drm/igt-gpu-tools.git
> Patchwork_21458: b7ef9de627b6edf88489282bddece7a342263c62 @ git://
> anongit.freedesktop.org/gfx-ci/linux
> 
> == Linux commits ==
> 
> b7ef9de627b6 drm/i915: Revert 'guc_id' from i915_request tracepoint
>
Rodrigo Vivi Oct. 28, 2021, 1:44 a.m. UTC | #3 
On Wed, 2021-10-27 at 14:15 +0300, Joonas Lahtinen wrote:
+ Jani and Rodrigo in order to pick this to -fixes.

picked up to drm-intel-next-fixes.

thanks,
Rodrigo.


Quoting Patchwork (2021-10-27 13:31:33)
Patch Details

Series:  drm/i915: Revert 'guc_id' from i915_request tracepoint
URL:     https://patchwork.freedesktop.org/series/96336/
State:   success
Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21458/index.html

CI Bug Log - changes from CI_DRM_10795 -> Patchwork_21458

Summary

SUCCESS

No regressions found.

Thanks for the review, this is now merged to drm-intel-gt-next.

Regards, Joonas

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

Participating hosts (37 -> 35)

Additional (2): fi-tgl-1115g4 fi-icl-u2
Missing (4): fi-bsw-cyan bat-adlp-4 bat-dg1-6 bat-dg1-5

Known issues

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

IGT changes

Issues hit

  • igt@amdgpu/amd_basic@query-info:

      □ fi-tgl-1115g4: NOTRUN -> SKIP (fdo#109315)
  • igt@amdgpu/amd_cs_nop@fork-gfx0:

      □ fi-icl-u2: NOTRUN -> SKIP (fdo#109315) +17 similar issues
  • igt@amdgpu/amd_cs_nop@nop-gfx0:

      □ fi-tgl-1115g4: NOTRUN -> SKIP (fdo#109315 / i915#2575) +16 similar
        issues
  • igt@gem_huc_copy@huc-copy:

      □ fi-tgl-1115g4: NOTRUN -> SKIP (i915#2190)

      □ fi-icl-u2: NOTRUN -> SKIP (i915#2190)

  • igt@i915_pm_backlight@basic-brightness:

      □ fi-tgl-1115g4: NOTRUN -> SKIP (i915#1155)
  • igt@i915_selftest@live@execlists:

      □ fi-bsw-n3050: PASS -> INCOMPLETE (i915#2940)
  • igt@kms_chamelium@common-hpd-after-suspend:

      □ fi-tgl-1115g4: NOTRUN -> SKIP (fdo#111827) +8 similar issues
  • igt@kms_chamelium@dp-crc-fast:

      □ fi-bsw-nick: NOTRUN -> SKIP (fdo#109271 / fdo#111827) +8 similar issues
  • igt@kms_chamelium@hdmi-hpd-fast:

      □ fi-icl-u2: NOTRUN -> SKIP (fdo#111827) +8 similar issues
  • igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:

      □ fi-tgl-1115g4: NOTRUN -> SKIP (i915#4103) +1 similar issue
  • igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:

      □ fi-icl-u2: NOTRUN -> SKIP (fdo#109278) +2 similar issues
  • igt@kms_force_connector_basic@force-load-detect:

      □ fi-tgl-1115g4: NOTRUN -> SKIP (fdo#109285)

      □ fi-icl-u2: NOTRUN -> SKIP (fdo#109285)

  • igt@kms_psr@primary_mmap_gtt:

      □ fi-tgl-1115g4: NOTRUN -> SKIP (i915#1072) +3 similar issues
  • igt@prime_vgem@basic-fence-flip:

      □ fi-bsw-nick: NOTRUN -> SKIP (fdo#109271) +57 similar issues
  • igt@prime_vgem@basic-userptr:

      □ fi-icl-u2: NOTRUN -> SKIP (i915#3301)

      □ fi-tgl-1115g4: NOTRUN -> SKIP (i915#3301)

  • igt@runner@aborted:

      □ fi-bsw-n3050: NOTRUN -> FAIL (fdo#109271 / i915#1436 / i915#3428 / i915
        #4312)

Possible fixes

  • igt@gem_exec_suspend@basic-s3:

      □ fi-bsw-nick: INCOMPLETE (i915#2369 / i915#3159) -> PASS
  • igt@kms_frontbuffer_tracking@basic:

      □ fi-cfl-8109u: DMESG-FAIL (i915#295) -> PASS
  • igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b:

      □ fi-cfl-8109u: DMESG-WARN (i915#295) -> PASS +10 similar issues

Build changes

  • Linux: CI_DRM_10795 -> Patchwork_21458

CI-20190529: 20190529
CI_DRM_10795: 59f3569eebe53403249227d476e81d09c63c0f0c @ git://
anongit.freedesktop.org/gfx-ci/linux
IGT_6262: d1c793b26e31cc6ae3f9fa3239805a9bbcc749fb @ https://
gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21458: b7ef9de627b6edf88489282bddece7a342263c62 @ git://
anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

b7ef9de627b6 drm/i915: Revert 'guc_id' from i915_request tracepoint
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index 9795f456cccf..8104981a6604 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -794,7 +794,6 @@  DECLARE_EVENT_CLASS(i915_request,
 	    TP_STRUCT__entry(
 			     __field(u32, dev)
 			     __field(u64, ctx)
-			     __field(u32, guc_id)
 			     __field(u16, class)
 			     __field(u16, instance)
 			     __field(u32, seqno)
@@ -805,16 +804,14 @@  DECLARE_EVENT_CLASS(i915_request,
 			   __entry->dev = rq->engine->i915->drm.primary->index;
 			   __entry->class = rq->engine->uabi_class;
 			   __entry->instance = rq->engine->uabi_instance;
-			   __entry->guc_id = rq->context->guc_id.id;
 			   __entry->ctx = rq->fence.context;
 			   __entry->seqno = rq->fence.seqno;
 			   __entry->tail = rq->tail;
 			   ),
 
-	    TP_printk("dev=%u, engine=%u:%u, guc_id=%u, ctx=%llu, seqno=%u, tail=%u",
+	    TP_printk("dev=%u, engine=%u:%u, ctx=%llu, seqno=%u, tail=%u",
 		      __entry->dev, __entry->class, __entry->instance,
-		      __entry->guc_id, __entry->ctx, __entry->seqno,
-		      __entry->tail)
+		      __entry->ctx, __entry->seqno, __entry->tail)
 );
 
 DEFINE_EVENT(i915_request, i915_request_add,