diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-07-16 03:10:15 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-07-16 03:10:16 +0300 |
| commit | 524d4f71e75503a8f707bfb5d74c7b58fb5eb181 (patch) | |
| tree | 2f5b1137ab5e2b149d522a8c0491fdd0c0d15b4c /drivers/gpu/drm/i915/i915_perf.c | |
| parent | 03d54ef0a1d5e5115744cb7dc7058e9852228114 (diff) | |
| parent | 92e0575b99835b5b3aaab2132dd551e0e04eb96a (diff) | |
| download | linux-524d4f71e75503a8f707bfb5d74c7b58fb5eb181.tar.xz | |
Merge tag 'drm-intel-fixes-2020-07-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
drm/i915 fixes for v5.8-rc6:
- FBC w/a stride fix
- Fix use-after-free fix on module reload
- Ignore irq enabling on the virtual engines to fix device sleep
- Use GTT when saving/restoring engine GPR
- Fix selftest sort function
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87ft9t0vtt.fsf@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_perf.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_perf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index 25329b7600c9..014f34c047d5 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -1592,6 +1592,7 @@ static u32 *save_restore_register(struct i915_perf_stream *stream, u32 *cs, u32 d; cmd = save ? MI_STORE_REGISTER_MEM : MI_LOAD_REGISTER_MEM; + cmd |= MI_SRM_LRM_GLOBAL_GTT; if (INTEL_GEN(stream->perf->i915) >= 8) cmd++; |