diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-02-04 14:42:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-02-04 14:42:34 +1000 |
| commit | 37fdaa3390cf3e0fde96941799543e85ea58f6ae (patch) | |
| tree | 1201304fc169c7c5fa0346c4a1e7a9d333a69aac /drivers/gpu/drm/i915/intel_crt.c | |
| parent | Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next (diff) | |
| parent | drm/bridge: dw-hdmi: add support for YUV420 output (diff) | |
| download | linux-dev-37fdaa3390cf3e0fde96941799543e85ea58f6ae.tar.xz linux-dev-37fdaa3390cf3e0fde96941799543e85ea58f6ae.zip | |
Merge tag 'drm-misc-next-2019-02-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.1:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- Split out some part of drm_crtc_helper.h into drm_probe_helper.h
- DRIVER_* flags improvements
- New tasks on the TODO-list
- Improvements to the documentation
Driver Changes:
- Continual of drmP.h removal in multiple drivers
- Removal of FBINFO_(FLAG_)DEFAULT in multiple drivers
- sun4i: Addition of the A23 support, multiple fixes for the tiled
formats
- atmel-hlcdc: Fix of clipping and rotation properties
- qxl: various BO-related improvements, prime and generic fbdev emulation
support
- dw-hdmi: Support for HDMI2.0 2160p modes and YUV420 output
- New Sitronix ST7701 panel driver
- New Kingdisplay KD097D04 panel driver
- New LeMaker BL035-RGB-002 panel driver
- New PDA 91-00156-A0 panel driver
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190201144749.t3abxvguhstu6bcl@flea
Diffstat (limited to 'drivers/gpu/drm/i915/intel_crt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index c2e799a5e63e..3716b2ee362f 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -29,8 +29,8 @@ #include <linux/slab.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> -#include <drm/drm_crtc_helper.h> #include <drm/drm_edid.h> +#include <drm/drm_probe_helper.h> #include "intel_drv.h" #include <drm/i915_drm.h> #include "i915_drv.h" |