diff options
| author |   Michał Winiarski <michal.winiarski@intel.com> | 2020-02-19 17:18:22 +0100 |
|---|---|---|
| committer |   Jani Nikula <jani.nikula@intel.com> | 2020-02-26 14:07:50 +0200 |
| commit | 2de0147d77168d6a227c00eb9c5a49374e1582a3 (patch) | |
| tree | 7db3d34aa0d208c292d701ccaf4f0ff8b63cdf34 /drivers/gpu/drm/i915/i915_pmu.h | |
| parent | drm/i915/pmu: Avoid using globals for CPU hotplug state (diff) | |
| download | linux-dev-2de0147d77168d6a227c00eb9c5a49374e1582a3.tar.xz linux-dev-2de0147d77168d6a227c00eb9c5a49374e1582a3.zip | |
drm/i915/pmu: Avoid using globals for PMU events
Attempting to bind / unbind module from devices where we have both
integrated and discreete GPU handled by i915, will cause us to try and
double free the global state, hitting null ptr deref in free_event_attributes.
Let's move it to i915_pmu.
Fixes: 05488673a4d4 ("drm/i915/pmu: Support multiple GPUs")
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200219161822.24592-2-michal.winiarski@intel.com
(cherry picked from commit 46129dc10f47c5c2b51c93a82b7b2aca46574ae0)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_pmu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_pmu.h b/drivers/gpu/drm/i915/i915_pmu.h index 207058391cec..f1d6cad0d7d5 100644 --- a/drivers/gpu/drm/i915/i915_pmu.h +++ b/drivers/gpu/drm/i915/i915_pmu.h @@ -108,6 +108,10 @@ struct i915_pmu { */ ktime_t sleep_last; /** + * @events_attr_group: Device events attribute group. + */ + struct attribute_group events_attr_group; + /** * @i915_attr: Memory block holding device attributes. */ void *i915_attr; |