diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-11-14 11:06:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-11-14 11:09:06 +1000 |
| commit | dfce90259d74d34cff4cb0c75ecfc0336c09520f (patch) | |
| tree | e13b4f5083043a15d53c096d924d21cc57b45b59 /drivers/gpu/drm/i915/i915_getparam.c | |
| parent | drm/i915/gen8+: Add RC6 CTX corruption WA (diff) | |
| parent | drm/i915/cmdparser: Fix jump whitelist clearing (diff) | |
| download | linux-dev-dfce90259d74d34cff4cb0c75ecfc0336c09520f.tar.xz linux-dev-dfce90259d74d34cff4cb0c75ecfc0336c09520f.zip | |
Backmerge i915 security patches from commit 'ea0b163b13ff' into drm-next
This backmerges the branch that ended up in Linus' tree. It removes
all the changes for the rc6 patches from Linus' tree in favour of
a patch that is based on a large refactor that occured.
Otherwise it all looks good.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_getparam.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_getparam.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_getparam.c b/drivers/gpu/drm/i915/i915_getparam.c index ad33fbe90a28..cf8a8c3ef047 100644 --- a/drivers/gpu/drm/i915/i915_getparam.c +++ b/drivers/gpu/drm/i915/i915_getparam.c @@ -63,7 +63,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data, value = !!(i915->caps.scheduler & I915_SCHEDULER_CAP_SEMAPHORES); break; case I915_PARAM_HAS_SECURE_BATCHES: - value = capable(CAP_SYS_ADMIN); + value = HAS_SECURE_BATCHES(i915) && capable(CAP_SYS_ADMIN); break; case I915_PARAM_CMD_PARSER_VERSION: value = i915_cmd_parser_get_version(i915); |