Skip to content

Commit

Permalink
drm/i915/perf: drop list of streams
Browse files Browse the repository at this point in the history
At some point in time there was the idea that we could have multiple
stream from the same piece of HW but that never materialized and given
the hard time we already have making everything work with the
submission side, there is no real point having this list of 1 element
around.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@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/20191008140111.5437-1-chris@chris-wilson.co.uk
  • Loading branch information
Lionel Landwerlin authored and Chris Wilson committed Oct 8, 2019
1 parent d14a701 commit 23b9e41
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
16 changes: 1 addition & 15 deletions drivers/gpu/drm/i915/i915_perf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1407,9 +1407,6 @@ static void gen7_init_oa_buffer(struct i915_perf_stream *stream)
*/
memset(stream->oa_buffer.vaddr, 0, OA_BUFFER_SIZE);

/* Maybe make ->pollin per-stream state if we support multiple
* concurrent streams in the future.
*/
stream->pollin = false;
}

Expand Down Expand Up @@ -1466,10 +1463,6 @@ static void gen8_init_oa_buffer(struct i915_perf_stream *stream)
*/
memset(stream->oa_buffer.vaddr, 0, OA_BUFFER_SIZE);

/*
* Maybe make ->pollin per-stream state if we support multiple
* concurrent streams in the future.
*/
stream->pollin = false;
}

Expand Down Expand Up @@ -2585,8 +2578,6 @@ static void i915_perf_destroy_locked(struct i915_perf_stream *stream)
if (stream->ops->destroy)
stream->ops->destroy(stream);

list_del(&stream->link);

if (stream->ctx)
i915_gem_context_put(stream->ctx);

Expand Down Expand Up @@ -2736,8 +2727,6 @@ i915_perf_open_ioctl_locked(struct i915_perf *perf,
goto err_flags;
}

list_add(&stream->link, &perf->streams);

if (param->flags & I915_PERF_FLAG_FD_CLOEXEC)
f_flags |= O_CLOEXEC;
if (param->flags & I915_PERF_FLAG_FD_NONBLOCK)
Expand All @@ -2746,7 +2735,7 @@ i915_perf_open_ioctl_locked(struct i915_perf *perf,
stream_fd = anon_inode_getfd("[i915_perf]", &fops, stream, f_flags);
if (stream_fd < 0) {
ret = stream_fd;
goto err_open;
goto err_flags;
}

if (!(param->flags & I915_PERF_FLAG_DISABLED))
Expand All @@ -2759,8 +2748,6 @@ i915_perf_open_ioctl_locked(struct i915_perf *perf,

return stream_fd;

err_open:
list_del(&stream->link);
err_flags:
if (stream->ops->destroy)
stream->ops->destroy(stream);
Expand Down Expand Up @@ -3600,7 +3587,6 @@ void i915_perf_init(struct drm_i915_private *i915)
}

if (perf->ops.enable_metric_set) {
INIT_LIST_HEAD(&perf->streams);
mutex_init(&perf->lock);

oa_sample_rate_hard_limit = 1000 *
Expand Down
6 changes: 0 additions & 6 deletions drivers/gpu/drm/i915/i915_perf_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,6 @@ struct i915_perf_stream {
*/
struct intel_gt *gt;

/**
* @link: Links the stream into ``&drm_i915_private->streams``
*/
struct list_head link;

/**
* @wakeref: As we keep the device awake while the perf stream is
* active, we track our runtime pm reference for later release.
Expand Down Expand Up @@ -352,7 +347,6 @@ struct i915_perf {
* except exclusive_stream.
*/
struct mutex lock;
struct list_head streams;

/*
* The stream currently using the OA unit. If accessed
Expand Down

0 comments on commit 23b9e41

Please sign in to comment.