diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2020-11-07 13:18:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-11-07 13:18:49 +0100 |
| commit | 0a986ea81e1aa8ac17e82cda53cc95158217956e (patch) | |
| tree | a054b0ef413b7f327c04137c5768b2da6488511d /drivers/gpu/drm/msm/adreno/a5xx_gpu.h | |
| parent | kprobes: Replace rp->free_instance with freelist (diff) | |
| parent | kprobes: Init kprobes in early_initcall (diff) | |
| download | linux-dev-0a986ea81e1aa8ac17e82cda53cc95158217956e.tar.xz linux-dev-0a986ea81e1aa8ac17e82cda53cc95158217956e.zip | |
Merge branch 'linus' into perf/kprobes
Merge recent kprobes updates into perf/kprobes that came from -mm.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/msm/adreno/a5xx_gpu.h')
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.h b/drivers/gpu/drm/msm/adreno/a5xx_gpu.h index 54868d4e3958..1e5b1a15a70f 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.h +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.h @@ -31,6 +31,7 @@ struct a5xx_gpu { struct msm_ringbuffer *next_ring; struct drm_gem_object *preempt_bo[MSM_GPU_MAX_RINGS]; + struct drm_gem_object *preempt_counters_bo[MSM_GPU_MAX_RINGS]; struct a5xx_preempt_record *preempt[MSM_GPU_MAX_RINGS]; uint64_t preempt_iova[MSM_GPU_MAX_RINGS]; |