diff options
| author | Joonas Lahtinen | 2019-02-20 10:04:08 +0100 |
|---|---|---|
| committer | Joonas Lahtinen | 2019-02-20 10:04:08 +0100 |
| commit | d0781a89c06f46d0f75e4e142061b8accb67cbe5 (patch) | |
| tree | 6a1731bfc76fd92aac1880c23f75377462e07b35 /drivers/gpu/drm/i915/intel_atomic_plane.c | |
| parent | drm/i915: Use time based guilty context banning (diff) | |
| parent | Merge https://gitlab.freedesktop.org/drm/msm into drm-next (diff) | |
| download | kernel-qcow2-linux-d0781a89c06f46d0f75e4e142061b8accb67cbe5.tar.gz kernel-qcow2-linux-d0781a89c06f46d0f75e4e142061b8accb67cbe5.tar.xz kernel-qcow2-linux-d0781a89c06f46d0f75e4e142061b8accb67cbe5.zip | |
Merge drm/drm-next into drm-intel-next-queued
Doing a backmerge to be able to merge topic/mei-hdcp-2019-02-19 PR.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic_plane.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_atomic_plane.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c index 021b94b78862..7961cf0e6951 100644 --- a/drivers/gpu/drm/i915/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c @@ -32,7 +32,9 @@ */ #include <drm/drm_atomic_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> + #include "intel_drv.h" struct intel_plane *intel_plane_alloc(void) |