diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-05-29 09:16:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-05-29 09:16:18 +1000 |
| commit | 63761f2d4bd173a3e8e9929827e92451e6671555 (patch) | |
| tree | aa8602af306efc7c7bb1095e672e927993f11640 /drivers/gpu/drm/i915/gt/selftest_workarounds.c | |
| parent | ed52a9b556f31c07d1697acb16bd6fdb6ad9f504 (diff) | |
| parent | 1f65efb624c4164bfd2e2a025fc25e8bfb651daa (diff) | |
Merge tag 'drm-intel-fixes-2020-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
couple compilation fixes for gcc-9+, and couple fixes for timeslicing,
one to respect I915_REQUEST_NOPREEMPT flag and another to incorporate
virtual engine into timeslicing.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200528185945.GA708600@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gt/selftest_workarounds.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/selftest_workarounds.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c index 5ed323254ee1..32785463ec9e 100644 --- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c +++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c @@ -623,6 +623,8 @@ err_request: err = -EINVAL; goto out_unpin; } + } else { + rsvd = 0; } expect = results[0]; |