diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-14 14:07:17 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-14 14:07:18 +0100 |
| commit | 8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0 (patch) | |
| tree | 299ada5e68937f5f356974c49ae0b3e5c4145f05 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 16065fcdd19ddb9e093192914ac863884f308766 (diff) | |
| parent | 6649a95d35d850e417f125821a803ca7889c713c (diff) | |
| download | linux-8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0.tar.gz linux-8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0.tar.bz2 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_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 619f1a20cc2d..ccb616351bba 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -24,23 +24,32 @@ * Eric Anholt <eric@anholt.net> */ -#include <linux/module.h> -#include <linux/input.h> #include <linux/i2c.h> +#include <linux/input.h> +#include <linux/intel-iommu.h> #include <linux/kernel.h> +#include <linux/module.h> +#include <linux/reservation.h> #include <linux/slab.h> #include <linux/vgaarb.h> -#include <drm/drm_edid.h> -#include <drm/i915_drm.h> + #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_atomic_uapi.h> #include <drm/drm_dp_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> #include <drm/drm_rect.h> -#include <drm/drm_atomic_uapi.h> -#include <linux/intel-iommu.h> -#include <linux/reservation.h> +#include <drm/i915_drm.h> + +#include "i915_drv.h" +#include "i915_gem_clflush.h" +#include "i915_trace.h" +#include "intel_drv.h" +#include "intel_dsi.h" +#include "intel_frontbuffer.h" #include "intel_drv.h" #include "intel_dsi.h" |