diff options
| author |   jsg <jsg@openbsd.org> | 2019-11-13 06:15:04 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2019-11-13 06:15:04 +0000 |
| commit | 3b0e8f24e7c8254ecce7cee4bd9bbee2b2e401b8 (patch) | |
| tree | 6952a55a9e84f6bab675fb2cdf26ce76023aa0c3 | |
| parent | drm/i915: Rename gen7 cmdparser tables (diff) | |
| download | wireguard-openbsd-3b0e8f24e7c8254ecce7cee4bd9bbee2b2e401b8.tar.xz wireguard-openbsd-3b0e8f24e7c8254ecce7cee4bd9bbee2b2e401b8.zip | |
drm/i915: Disable Secure Batches for gen6+
From Jon Bloomfield
f1ff77080fa1828dfd67b3082053da1fbb80dfff in linux 4.19.y/4.19.84
44157641d448cbc0c4b73c5231d2b911f0cb0427 in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.c | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.h | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_gem_execbuffer.c | 12 |
3 files changed, 13 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index 1651132afad..3fe63166a9f 100644 --- a/sys/dev/pci/drm/i915/i915_drv.c +++ b/sys/dev/pci/drm/i915/i915_drv.c @@ -369,7 +369,7 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data, value = HAS_LEGACY_SEMAPHORES(dev_priv); break; case I915_PARAM_HAS_SECURE_BATCHES: - value = capable(CAP_SYS_ADMIN); + value = HAS_SECURE_BATCHES(dev_priv) && capable(CAP_SYS_ADMIN); break; case I915_PARAM_CMD_PARSER_VERSION: value = i915_cmd_parser_get_version(dev_priv); diff --git a/sys/dev/pci/drm/i915/i915_drv.h b/sys/dev/pci/drm/i915/i915_drv.h index 5d1fd179a4b..8b311dd09fc 100644 --- a/sys/dev/pci/drm/i915/i915_drv.h +++ b/sys/dev/pci/drm/i915/i915_drv.h @@ -2678,6 +2678,8 @@ intel_info(const struct drm_i915_private *dev_priv) #define HAS_LEGACY_SEMAPHORES(dev_priv) IS_GEN7(dev_priv) +#define HAS_SECURE_BATCHES(dev_priv) (INTEL_GEN(dev_priv) < 6) + #define HAS_LLC(dev_priv) ((dev_priv)->info.has_llc) #define HAS_SNOOP(dev_priv) ((dev_priv)->info.has_snoop) #define HAS_EDRAM(dev_priv) (!!((dev_priv)->edram_cap & EDRAM_ENABLED)) diff --git a/sys/dev/pci/drm/i915/i915_gem_execbuffer.c b/sys/dev/pci/drm/i915/i915_gem_execbuffer.c index dc4053e5d9b..1ce42ee0a05 100644 --- a/sys/dev/pci/drm/i915/i915_gem_execbuffer.c +++ b/sys/dev/pci/drm/i915/i915_gem_execbuffer.c @@ -2209,6 +2209,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, struct drm_i915_gem_exec_object2 *exec, struct drm_syncobj **fences) { + struct drm_i915_private *i915 = to_i915(dev); struct i915_execbuffer eb; struct dma_fence *in_fence = NULL; struct sync_file *out_fence = NULL; @@ -2219,7 +2220,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, BUILD_BUG_ON(__EXEC_OBJECT_INTERNAL_FLAGS & ~__EXEC_OBJECT_UNKNOWN_FLAGS); - eb.i915 = to_i915(dev); + eb.i915 = i915; eb.file = file; eb.args = args; if (DBG_FORCE_RELOC || !(args->flags & I915_EXEC_NO_RELOC)) @@ -2241,8 +2242,15 @@ i915_gem_do_execbuffer(struct drm_device *dev, eb.batch_flags = 0; if (args->flags & I915_EXEC_SECURE) { + if (INTEL_GEN(i915) >= 11) + return -ENODEV; + + /* Return -EPERM to trigger fallback code on old binaries. */ + if (!HAS_SECURE_BATCHES(i915)) + return -EPERM; + if (!drm_is_current_master(file) || !capable(CAP_SYS_ADMIN)) - return -EPERM; + return -EPERM; eb.batch_flags |= I915_DISPATCH_SECURE; } |