diff options
| author | Daniel Vetter | 2019-02-14 14:07:17 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2019-02-14 14:07:18 +0100 |
| commit | 8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0 (patch) | |
| tree | 299ada5e68937f5f356974c49ae0b3e5c4145f05 /drivers/gpu/drm/i915/intel_atomic.c | |
| parent | drm/virtio: do NOT reuse resource ids (diff) | |
| parent | drm/komeda: fix build with drm_modeset_helper.h update (diff) | |
| download | kernel-qcow2-linux-8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0.tar.gz kernel-qcow2-linux-8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0.tar.xz kernel-qcow2-linux-8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0.zip | |
Merge tag 'drm-misc-next-2019-02-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.1:
UAPI Changes:
- New fourcc for P010 and P016 formats
Cross-subsystem Changes:
Core Changes:
- Removal of drm_calc_{h,v}scale_relaxed
- A few fixes for DP-MST
Driver Changes:
- More drmP.h cleanups
- A bunch of vkms fixes
- Conversion of the Cadence DSI bridge and Allwinner DSI driver to the
generic phy MIPI-DPHY API
- New panel: Innolux EE101IA-01D
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190211095220.3oeodszr2dgxrwqq@flea
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_atomic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index 16263add3cdd..7cf9290ea34a 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -31,7 +31,9 @@ #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> + #include "intel_drv.h" /** |