diff options
| author |   Jon Bloomfield <jon.bloomfield@intel.com> | 2018-06-08 08:53:46 -0700 |
|---|---|---|
| committer | Jon Bloomfield <jon.bloomfield@intel.com> | 2019-11-05 11:34:08 -0800 |
| commit | 44157641d448cbc0c4b73c5231d2b911f0cb0427 (patch) | |
| tree | 80f7c1f784a4466052716c31e61dcb1b6e04f358 /drivers/gpu/drm/i915/i915_getparam.c | |
| parent | drm/i915: Rename gen7 cmdparser tables (diff) | |
| download | linux-dev-44157641d448cbc0c4b73c5231d2b911f0cb0427.tar.xz linux-dev-44157641d448cbc0c4b73c5231d2b911f0cb0427.zip | |
drm/i915: Disable Secure Batches for gen6+
Retroactively stop reporting support for secure batches
through the api for gen6+ so that older binaries trigger
the fallback path instead.
Older binaries use secure batches pre gen6 to access resources
that are not available to normal usermode processes. However,
all known userspace explicitly checks for HAS_SECURE_BATCHES
before relying on the secure batch feature.
Since there are no known binaries relying on this for newer gens
we can kill secure batches from gen6, via I915_PARAM_HAS_SECURE_BATCHES.
v2: rebase (Mika)
v3: rebase (Mika)
Signed-off-by: Jon Bloomfield <jon.bloomfield@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Tyler Hicks <tyhicks@canonical.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Chris Wilson <chris.p.wilson@intel.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 5d9101376a3d..9f1517af5b7f 100644 --- a/drivers/gpu/drm/i915/i915_getparam.c +++ b/drivers/gpu/drm/i915/i915_getparam.c @@ -62,7 +62,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); |