drm/i915: Keep a list of probed devices
Subsystems (2)
Tvrtko Ursulin
maintainerRFC 1/2 drm/i915: Keep a list of probed devices
From: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.c | 12 ++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 5 +++++ 2 files changed, 17 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +12 -0
@@ -1207,6 +1207,9 @@ static void i915_driver_cleanup_hw(struct drm_i915_private *dev_priv)i915_ggtt_cleanup_hw (dev_priv); } +DEFINE_MUTEX (i915_driver_list_lock); +LIST_HEAD (i915_driver_list); +/** * i915_driver_register - register the driver with the rest of the system * @dev_priv: device private
@@ -1264,6 +1267,11 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)*/ if (INTEL_INFO (dev_priv)->num_pipes)drm_kms_helper_poll_init (dev); + +INIT_LIST_HEAD (&dev_priv->driver_list_link); +mutex_lock (&i915_driver_list_lock); +list_add_tail (&dev_priv->driver_list_link, &i915_driver_list); +mutex_unlock (&i915_driver_list_lock); }/**
@@ -1275,6 +1283,10 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)intel_fbdev_unregister (dev_priv);intel_audio_deinit (dev_priv); +mutex_lock (&i915_driver_list_lock); +list_del (&dev_priv->driver_list_link); +mutex_unlock (&i915_driver_list_lock); +/* * After flushing the fbdev (incl. a late async config which will * have delayed queuing of a hotplug event), then flush the hotplug
drivers/gpu/drm/i915/i915_drv.h +5 -0
@@ -2142,12 +2142,17 @@ struct drm_i915_private {struct i915_pmu pmu; +struct list_head driver_list_link; +/* * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch * will be rejected. Instead look for a better place. */ }; +extern struct mutex i915_driver_list_lock; +extern struct list_head i915_driver_list; +static inline struct drm_i915_private *to_i915 (const struct drm_device *dev) { return container_of(dev, struct drm_i915_private, drm);
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerRFC 2/2 drm/i915/tracing: Enable user interrupts while intel_engine_notify is active
From: Tvrtko Ursulin <[email protected]>
Keep the user interrupt enabled while intel_engine_notify tracepoint is enabled.
We use tracepoint (de)registration callbacks to enable user interrupts on all devices (future proofing and avoiding ugly global pointers) and all engines.
Premise is that if someone is listening, they want to see interrupts logged.
Commit to be improved...
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_trace.h | 50 ++++++++------- drivers/gpu/drm/i915/i915_tracing.c | 96 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_tracing.h | 13 ++++ 6 files changed, 141 insertions(+), 23 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_tracing.c create mode 100644 drivers/gpu/drm/i915/i915_tracing.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -77,6 +77,7 @@ i915-y += i915_cmd_parser.o \ i915_request.o \ i915_timeline.o \ i915_trace_points.o \ + i915_tracing.o \ i915_vma.o \ intel_breadcrumbs.o \ intel_engine_cs.o \
drivers/gpu/drm/i915/i915_drv.c +2 -0
@@ -1271,6 +1271,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)INIT_LIST_HEAD (&dev_priv->driver_list_link);mutex_lock (&i915_driver_list_lock);list_add_tail (&dev_priv->driver_list_link, &i915_driver_list); +i915_tracing_register (dev_priv);mutex_unlock (&i915_driver_list_lock); }
@@ -1285,6 +1286,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)mutex_lock (&i915_driver_list_lock);list_del (&dev_priv->driver_list_link); +i915_tracing_unregister (dev_priv);mutex_unlock (&i915_driver_list_lock);/*
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2144,6 +2144,8 @@ struct drm_i915_private {struct list_head driver_list_link; +bool engine_notify_tracepoint; +/* * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch * will be rejected. Instead look for a better place.
drivers/gpu/drm/i915/i915_trace.h +27 -23
62 lines not on this page · raw message
drivers/gpu/drm/i915/i915_tracing.c new file +96 -0
96 lines not on this page · raw message
drivers/gpu/drm/i915/i915_tracing.h new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright © 2018 Intel Corporation +* +*/ + +#include "i915_drv.h" + +void i915_tracing_register (struct drm_i915_private *i915); +void i915_tracing_unregister (struct drm_i915_private *i915); + +int intel_engine_notify_tracepoint_register (void ); +void intel_engine_notify_tracepoint_unregister (void );
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 2/2] drm/i915/tracing: Enable user interrupts while intel_engine_notify is active
ping!
Quoted 252 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Keep the user interrupt enabled while
intel_engine_notifytracepoint is enabled.We use tracepoint (de)registration callbacks to enable user interrupts on all devices (future proofing and avoiding ugly global pointers) and all engines.
Premise is that if someone is listening, they want to see interrupts logged.
Commit to be improved...
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_trace.h | 50 ++++++++------- drivers/gpu/drm/i915/i915_tracing.c | 96 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_tracing.h | 13 ++++ 6 files changed, 141 insertions(+), 23 deletions(-)create mode 100644
drivers/gpu/drm/i915/i915_tracing.ccreate mode 100644drivers/gpu/drm/i915/i915_tracing.hdrivers/gpu/drm/i915/Makefile +1
-0@@ -77,6 +77,7 @@ i915-y += i915_cmd_parser.o \ i915_request.o \ i915_timeline.o \ i915_trace_points.o \ + i915_tracing.o \ i915_vma.o \ intel_breadcrumbs.o \ intel_engine_cs.o \drivers/gpu/drm/i915/i915_drv.c +2
-0@@ -1271,6 +1271,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)INIT_LIST_HEAD (&dev_priv->driver_list_link);mutex_lock (&i915_driver_list_lock);list_add_tail (&dev_priv->driver_list_link, &i915_driver_list); +i915_tracing_register (dev_priv);mutex_unlock (&i915_driver_list_lock); }@@ -1285,6 +1286,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)mutex_lock (&i915_driver_list_lock);list_del (&dev_priv->driver_list_link); +i915_tracing_unregister (dev_priv);mutex_unlock (&i915_driver_list_lock);/* drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -2144,6 +2144,8 @@ struct drm_i915_private {struct list_head driver_list_link; +bool engine_notify_tracepoint; +/* * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch * will be rejected. Instead look for a better place. drivers/gpu/drm/i915/i915_trace.h +27
-23@@ -8,6 +8,7 @@#include <drm/drmP.h> #include "i915_drv.h" +#include "i915_tracing.h" #include "intel_drv.h" #include "intel_ringbuffer.h" @@ -750,29 +751,32 @@ TRACE_EVENT(i915_request_out, __entry->global_seqno, __entry->completed) ); -TRACE_EVENT (intel_engine_notify, - TP_PROTO(struct intel_engine_cs *engine, bool waiters), -TP_ARGS (engine, waiters), - -TP_STRUCT__entry ( - __field(u32, dev) - __field(u16, class) - __field(u16, instance) - __field(u32, seqno) -__field (bool, waiters) - ), - -TP_fast_assign ( - __entry->dev = engine->i915->drm.primary->index; - __entry->class = engine->uabi_class; - __entry->instance = engine->instance; - __entry->seqno = intel_engine_get_seqno(engine); - __entry->waiters = waiters; - ), - -TP_printk ("dev=%u, engine=%u:%u, seqno=%u, waiters=%u" , - __entry->dev, __entry->class, __entry->instance, - __entry->seqno, __entry->waiters) +TRACE_EVENT_FN (intel_engine_notify, + TP_PROTO(struct intel_engine_cs *engine, bool waiters), +TP_ARGS (engine, waiters), + +TP_STRUCT__entry ( + __field(u32, dev) + __field(u16, class) + __field(u16, instance) + __field(u32, seqno) +__field (bool, waiters) + ), + +TP_fast_assign ( + __entry->dev = engine->i915->drm.primary->index; + __entry->class = engine->uabi_class; + __entry->instance = engine->instance; + __entry->seqno = intel_engine_get_seqno(engine); + __entry->waiters = waiters; + ), + +TP_printk ("dev=%u, engine=%u:%u, seqno=%u, waiters=%u" , + __entry->dev, __entry->class, __entry->instance, + __entry->seqno, __entry->waiters), + + intel_engine_notify_tracepoint_register, + intel_engine_notify_tracepoint_unregister ); DEFINE_EVENT(i915_request, i915_request_retire,drivers/gpu/drm/i915/i915_tracing.c new file +96
-0@@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright © 2018 Intel Corporation +* +*/ + +#include "i915_tracing.h" + +#include "i915_drv.h" +#include "intel_ringbuffer.h" + +void i915_tracing_register (struct drm_i915_private *i915) +{ +struct intel_engine_cs *engine; +struct drm_i915_private *p; +enum intel_engine_id id; +bool enable = false; + +lockdep_assert_held (&i915_driver_list_lock); + +list_for_each_entry (p, &i915_driver_list, driver_list_link) { + enable = p->engine_notify_tracepoint; +if (enable) +break ; + } + +if (!enable) +return ; + +for_each_engine (engine, i915, id) +intel_engine_pin_breadcrumbs_irq (engine); + + i915->engine_notify_tracepoint = true; +} + +void i915_tracing_unregister (struct drm_i915_private *i915) +{ +struct intel_engine_cs *engine; +enum intel_engine_id id; + +lockdep_assert_held (&i915_driver_list_lock); + +if (!i915->engine_notify_tracepoint) +return ; + +for_each_engine (engine, i915, id) +intel_engine_unpin_breadcrumbs_irq (engine); + + i915->engine_notify_tracepoint = false; +} + +int intel_engine_notify_tracepoint_register (void ) +{ +struct drm_i915_private *i915; + +mutex_lock (&i915_driver_list_lock); +list_for_each_entry (i915, &i915_driver_list, driver_list_link) { +struct intel_engine_cs *engine; +enum intel_engine_id id; + +intel_runtime_pm_get (i915); + +for_each_engine (engine, i915, id) +intel_engine_pin_breadcrumbs_irq (engine); + +intel_runtime_pm_put (i915); + +GEM_BUG_ON (i915->engine_notify_tracepoint); + i915->engine_notify_tracepoint = true; + } +mutex_unlock (&i915_driver_list_lock); + +return 0 ; +} + +void intel_engine_notify_tracepoint_unregister (void ) +{ +struct drm_i915_private *i915; + +mutex_lock (&i915_driver_list_lock); +list_for_each_entry (i915, &i915_driver_list, driver_list_link) { +struct intel_engine_cs *engine; +enum intel_engine_id id; + +intel_runtime_pm_get (i915); + +for_each_engine (engine, i915, id) +intel_engine_unpin_breadcrumbs_irq (engine); + +intel_runtime_pm_put (i915); + +GEM_BUG_ON (!i915->engine_notify_tracepoint); + i915->engine_notify_tracepoint = false; + } +mutex_unlock (&i915_driver_list_lock); +}drivers/gpu/drm/i915/i915_tracing.h new file +3
-0@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright © 2018 Intel Corporation
drivers/gpu/drm/i915/i915_tracing.h line 13
Quoted 10 lines
drivers/gpu/drm/i915/i915_tracing.h new file +10
-0+* +*/ + +#include "i915_drv.h" + +void i915_tracing_register (struct drm_i915_private *i915); +void i915_tracing_unregister (struct drm_i915_private *i915); + +int intel_engine_notify_tracepoint_register (void ); +void intel_engine_notify_tracepoint_unregister (void );
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 2/2] drm/i915/tracing: Enable user interrupts while intel_engine_notify is active
In reply to Tvrtko UrsulinQuoting Tvrtko Ursulin (2018-06-25 18:32:37)
Quoted 32 lines
From: Tvrtko Ursulin <[email protected]>
Keep the user interrupt enabled while
intel_engine_notifytracepoint is enabled.We use tracepoint (de)registration callbacks to enable user interrupts on all devices (future proofing and avoiding ugly global pointers) and all engines.
Premise is that if someone is listening, they want to see interrupts logged.
Commit to be improved...
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_trace.h | 50 ++++++++------- drivers/gpu/drm/i915/i915_tracing.c | 96 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_tracing.h | 13 ++++ 6 files changed, 141 insertions(+), 23 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_tracing.c create mode 100644 drivers/gpu/drm/i915/i915_tracing.hdrivers/gpu/drm/i915/Makefile +0
-0
drivers/gpu/drm/i915/Makefile i915-y += i915_cmd_parser.o \ · line 80
Quoted 4 lines
drivers/gpu/drm/i915/Makefile +1
-0@@ -77,6 +77,7 @@ i915-y += i915_cmd_parser.o \ i915_request.o \ i915_timeline.o \ i915_trace_points.o \ + i915_tracing.o \
No fancy obj-$(TRACING) ? :)
Quoted 58 lines
drivers/gpu/drm/i915/Makefile +0
-0i915_vma.o \ intel_breadcrumbs.o \ intel_engine_cs.o \drivers/gpu/drm/i915/i915_drv.c +2
-0@@ -1271,6 +1271,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)INIT_LIST_HEAD (&dev_priv->driver_list_link);mutex_lock (&i915_driver_list_lock);list_add_tail (&dev_priv->driver_list_link, &i915_driver_list); +i915_tracing_register (dev_priv);mutex_unlock (&i915_driver_list_lock); }@@ -1285,6 +1286,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)mutex_lock (&i915_driver_list_lock);list_del (&dev_priv->driver_list_link); +i915_tracing_unregister (dev_priv);mutex_unlock (&i915_driver_list_lock);/* drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -2144,6 +2144,8 @@ struct drm_i915_private {struct list_head driver_list_link; +bool engine_notify_tracepoint; +/* * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch * will be rejected. Instead look for a better place. drivers/gpu/drm/i915/i915_tracing.c new file +15
-0@@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright © 2018 Intel Corporation +* +*/ + +#include "i915_tracing.h" + +#include "i915_drv.h" +#include "intel_ringbuffer.h" + +void i915_tracing_register (struct drm_i915_private *i915) +{ +struct intel_engine_cs *engine; +struct drm_i915_private *p;
drivers/gpu/drm/i915/i915_tracing.c line 25
Quoted 10 lines
drivers/gpu/drm/i915/i915_tracing.c new file +10
-0+enum intel_engine_id id; +bool enable = false; + +lockdep_assert_held (&i915_driver_list_lock); + +list_for_each_entry (p, &i915_driver_list, driver_list_link) { + enable = p->engine_notify_tracepoint; +if (enable) +break ; + }
All on this list are expected to have the same value of engine_notify_tracepoint. As far as I can tell, engine_notify_tracepoint is just a global and there's no particular advantage in having it per-device. The caveat is that i915_tracing_register/unregister must be called under the same lock as the list_add/del -- I wonder if that device list should just be moved to i915_tracing.c and kept entirely private? (Then any future use case would also likely instantiate their own mutex and list?)
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 2/2] drm/i915/tracing: Enable user interrupts while intel_engine_notify is active
Quoted 28 lines · Chris Wilson
Quoting Tvrtko Ursulin (2018-06-25 18:32:37)
Quoted 27 lines
From: Tvrtko Ursulin <[email protected]>
Keep the user interrupt enabled while
intel_engine_notifytracepoint is enabled.We use tracepoint (de)registration callbacks to enable user interrupts on all devices (future proofing and avoiding ugly global pointers) and all engines.
Premise is that if someone is listening, they want to see interrupts logged.
Commit to be improved...
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_trace.h | 50 ++++++++------- drivers/gpu/drm/i915/i915_tracing.c | 96 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_tracing.h | 13 ++++ 6 files changed, 141 insertions(+), 23 deletions(-)create mode 100644
drivers/gpu/drm/i915/i915_tracing.ccreate mode 100644drivers/gpu/drm/i915/i915_tracing.h
Quoted 11 lines
drivers/gpu/drm/i915/Makefile i915-y += i915_cmd_parser.o \ · line 80
Quoted 9 lines
drivers/gpu/drm/i915/Makefile +1
-0@@ -77,6 +77,7 @@ i915-y += i915_cmd_parser.o \ i915_request.o \ i915_timeline.o \ i915_trace_points.o \ + i915_tracing.o \No fancy obj-$(TRACING) ? :)
Just a miss, marking as TODO.
Quoted 70 lines
Quoted 59 lines
drivers/gpu/drm/i915/Makefile +0
-0i915_vma.o \ intel_breadcrumbs.o \ intel_engine_cs.o \drivers/gpu/drm/i915/i915_drv.c +2
-0@@ -1271,6 +1271,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)INIT_LIST_HEAD (&dev_priv->driver_list_link);mutex_lock (&i915_driver_list_lock);list_add_tail (&dev_priv->driver_list_link, &i915_driver_list); +i915_tracing_register (dev_priv);mutex_unlock (&i915_driver_list_lock); }@@ -1285,6 +1286,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)mutex_lock (&i915_driver_list_lock);list_del (&dev_priv->driver_list_link); +i915_tracing_unregister (dev_priv);mutex_unlock (&i915_driver_list_lock);/* drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -2144,6 +2144,8 @@ struct drm_i915_private {struct list_head driver_list_link; +bool engine_notify_tracepoint; +/* * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch * will be rejected. Instead look for a better place. drivers/gpu/drm/i915/i915_tracing.c new file +15
-0@@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright © 2018 Intel Corporation +* +*/ + +#include "i915_tracing.h" + +#include "i915_drv.h" +#include "intel_ringbuffer.h" + +void i915_tracing_register (struct drm_i915_private *i915) +{ +struct intel_engine_cs *engine; +struct drm_i915_private *p;drivers/gpu/drm/i915/i915_tracing.c line 25
Quoted 10 lines
drivers/gpu/drm/i915/i915_tracing.c new file +10
-0+enum intel_engine_id id; +bool enable = false; + +lockdep_assert_held (&i915_driver_list_lock); + +list_for_each_entry (p, &i915_driver_list, driver_list_link) { + enable = p->engine_notify_tracepoint; +if (enable) +break ; + }
Quoted 8 lines
All on this list are expected to have the same value of
engine_notify_tracepoint. As far as I can tell,engine_notify_tracepointis just a global and there's no particular advantage in having it per-device. The caveat is that i915_tracing_register/unregister must be called under the same lock as the list_add/del -- I wonder if that device list should just be moved toi915_tracing.cand kept entirely private? (Then any future use case would also likely instantiate their own mutex and list?)
Agreed, probably better to keep it private since exported list is totally useless now. If there are no fundamental objections on the idea I'll re-spin with that change.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [RFC,1/2] drm/i915: Keep a list of probed devices
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: series starting with [RFC,1/2] drm/i915: Keep a list of probed devices
URL : https://patchwork.freedesktop.org/series/45353/
State : failure
== Summary ==
Applying: drm/i915: Keep a list of probed devices
Applying: drm/i915/tracing: Enable user interrupts while intel_engine_notify is active Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_trace.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_trace.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_trace.h
error: Failed to merge in the changes.
Patch failed at 0002 drm/i915/tracing: Enable user interrupts while intel_engine_notify is active Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx