summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_priolist_types.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-05-29 09:16:01 +1000
committerDave Airlie <airlied@redhat.com>2020-05-29 09:16:18 +1000
commit63761f2d4bd173a3e8e9929827e92451e6671555 (patch)
treeaa8602af306efc7c7bb1095e672e927993f11640 /drivers/gpu/drm/i915/i915_priolist_types.h
parented52a9b556f31c07d1697acb16bd6fdb6ad9f504 (diff)
parent1f65efb624c4164bfd2e2a025fc25e8bfb651daa (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/i915_priolist_types.h')
-rw-r--r--drivers/gpu/drm/i915/i915_priolist_types.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_priolist_types.h b/drivers/gpu/drm/i915/i915_priolist_types.h
index 732aad148881..eb97d626f9ad 100644
--- a/drivers/gpu/drm/i915/i915_priolist_types.h
+++ b/drivers/gpu/drm/i915/i915_priolist_types.h
@@ -45,7 +45,7 @@ enum {
* active request.
*/
#define I915_PRIORITY_UNPREEMPTABLE INT_MAX
-#define I915_PRIORITY_BARRIER INT_MAX
+#define I915_PRIORITY_BARRIER (I915_PRIORITY_UNPREEMPTABLE - 1)
#define __NO_PREEMPTION (I915_PRIORITY_WAIT)