diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-12-04 04:45:37 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-12-04 04:45:45 +0300 |
| commit | 94cfbd05e46a31cc181e7ac6bc4b32ac09f8864f (patch) | |
| tree | 56c96fe4172cfab8abe7023bc55a5f78d1aaa044 /drivers/gpu/drm/i915/i915_request.h | |
| parent | aac06646aa85772eed49931d721e917209cabb51 (diff) | |
| parent | ccc9e67ab26feda7e62749bb54c05d7abe07dca9 (diff) | |
| download | linux-94cfbd05e46a31cc181e7ac6bc4b32ac09f8864f.tar.xz | |
Merge tag 'drm-intel-fixes-2020-12-03' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
Fixes for GPU hang, null dereference, suspend-resume, power consumption, and use-after-free.
- Program mocs:63 for cache eviction on gen9 (Chris)
- Protect context lifetime with RCU (Chris)
- Split the breadcrumb spinlock between global and contexts (Chris)
- Retain default context state across shrinking (Venkata)
- Limit frequency drop to RPe on parking (Chris)
- Return earlier from intel_modeset_init() without display (Jani)
- Defer initial modeset until after GGTT is initialized (Chris)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201203134705.GA1575873@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_request.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_request.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h index 874af6db6103..620b6fab2c5c 100644 --- a/drivers/gpu/drm/i915/i915_request.h +++ b/drivers/gpu/drm/i915/i915_request.h @@ -177,10 +177,8 @@ struct i915_request { struct intel_ring *ring; struct intel_timeline __rcu *timeline; - union { - struct list_head signal_link; - struct llist_node signal_node; - }; + struct list_head signal_link; + struct llist_node signal_node; /* * The rcu epoch of when this request was allocated. Used to judiciously |