diff options
| author | Matthew Auld <matthew.auld@intel.com> | 2017-03-27 21:34:59 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-03-29 13:52:20 +0300 |
| commit | 4e5f713ffc202c49a4374897cb0d2b218b391ff7 (patch) | |
| tree | 3c8c28fd7c554f5e2d064fa1e00f569e4febd060 /drivers/gpu/drm/i915/i915_perf.c | |
| parent | 9e1764309f577a88a0d5250fea6a080a6ad43556 (diff) | |
| download | op-kernel-dev-4e5f713ffc202c49a4374897cb0d2b218b391ff7.zip op-kernel-dev-4e5f713ffc202c49a4374897cb0d2b218b391ff7.tar.gz | |
drm/i915/perf: destroy stream on sample_flags mismatch
If we were to ever encounter a sample_flags mismatch we need to ensure
we destroy the stream when we bail.
Fixes: d79651522e89 ("drm/i915: Enable i915 perf stream for Haswell OA unit")
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Robert Bragg <robert@sixbynine.org>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170327203459.18398-1-matthew.auld@intel.com
(cherry picked from commit 22f880ca8246c6c80c4f48731c6a7d5d15042f56)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_perf.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_perf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index a1b7eec..f8fcb31 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -1705,7 +1705,7 @@ i915_perf_open_ioctl_locked(struct drm_i915_private *dev_priv, */ if (WARN_ON(stream->sample_flags != props->sample_flags)) { ret = -ENODEV; - goto err_alloc; + goto err_flags; } list_add(&stream->link, &dev_priv->perf.streams); @@ -1728,6 +1728,7 @@ i915_perf_open_ioctl_locked(struct drm_i915_private *dev_priv, err_open: list_del(&stream->link); +err_flags: if (stream->ops->destroy) stream->ops->destroy(stream); err_alloc: |
