diff options
| author | Daniel Vetter | 2017-03-08 10:54:45 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2017-03-08 10:54:45 +0100 |
| commit | 7ffe939dd9c71e149f31817394b70b52b4067304 (patch) | |
| tree | d779769f1477be9b9976699d6778a45edd001e4a /drivers/gpu/drm/i915/intel_breadcrumbs.c | |
| parent | drm/i915: Use pagecache write to prepopulate shmemfs from pwrite-ioctl (diff) | |
| parent | Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next (diff) | |
| download | kernel-qcow2-linux-7ffe939dd9c71e149f31817394b70b52b4067304.tar.gz kernel-qcow2-linux-7ffe939dd9c71e149f31817394b70b52b4067304.tar.xz kernel-qcow2-linux-7ffe939dd9c71e149f31817394b70b52b4067304.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge drm-next to get at all the good stuff in drm-misc. We need
that because:
- drm_connector_list_iter conversion for i915 needs the core patches.
- Maarten's patches to use the new atomic state iterators also need
the core patches.
- We need the new link status property to complete the DP retraining
work, merging through 2 branches wasn't a good idea and we had to
partially backtrack.
- Chris needs reservation_object_trylock and we want to roll out
kref_read everywhere.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_breadcrumbs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_breadcrumbs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c index f96d0f368f59..2a1ed6d7ad4d 100644 --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c @@ -23,6 +23,7 @@ */ #include <linux/kthread.h> +#include <uapi/linux/sched/types.h> #include "i915_drv.h" |