Backmerge i915 security patches from commit 'ea0b163b13ff' into drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 14 Nov 2019 01:06:01 +0000 (11:06 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 14 Nov 2019 01:09:06 +0000 (11:09 +1000)
commitdfce90259d74d34cff4cb0c75ecfc0336c09520f
treee13b4f5083043a15d53c096d924d21cc57b45b59
parent2248a28384fedb84d1d068383bbec113cc4ce0fe
parentea0b163b13ffc52818c079adb00d55e227a6da6f
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>
drivers/gpu/drm/i915/gem/i915_gem_context.c
drivers/gpu/drm/i915/gem/i915_gem_context_types.h
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
drivers/gpu/drm/i915/gt/intel_engine_types.h
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_getparam.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_pm.c