diff options
| author | Dave Airlie | 2018-09-14 01:43:06 +0200 |
|---|---|---|
| committer | Dave Airlie | 2018-09-14 01:43:16 +0200 |
| commit | 2dc7bad71cd310dc94d1c9907909324dd2b0618f (patch) | |
| tree | a087555dd4b1588eeac02c1af5d8dde7b5bb15fa /drivers/gpu/drm/i915/intel_display.h | |
| parent | Merge tag 'drm-intel-next-2018-09-06-2' of git://anongit.freedesktop.org/drm/... (diff) | |
| parent | drm: bridge: document bridge attach/detach imbalance (diff) | |
| download | kernel-qcow2-linux-2dc7bad71cd310dc94d1c9907909324dd2b0618f.tar.gz kernel-qcow2-linux-2dc7bad71cd310dc94d1c9907909324dd2b0618f.tar.xz kernel-qcow2-linux-2dc7bad71cd310dc94d1c9907909324dd2b0618f.zip | |
Merge tag 'drm-misc-next-2018-09-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 4.20:
UAPI Changes:
- Add host endian variants for the most common formats (Gerd)
- Fail ADDFB2 for big-endian drivers that don't advertise BE quirk (Gerd)
- clear smem_start in fbdev for drm drivers to avoid leaking fb addr (Daniel)
Cross-subsystem Changes:
Core Changes:
- fix drm_mode_addfb() on big endian machines (Gerd)
- add timeline point to syncobj find+replace (Chunming)
- more drmP.h removal effort (Daniel)
- split uapi portions of drm_atomic.c into drm_atomic_uapi.c (Daniel)
Driver Changes:
- bochs: Convert open-coded portions to use helpers (Peter)
- vkms: Add cursor support (Haneen)
- udmabuf: Lots of fixups (mostly cosmetic afaict) (Gerd)
- qxl: Convert to use fbdev helper (Peter)
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Chunming Zhou <david1.zhou@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Peter Wu <peter@lekensteyn.nl>
Cc: Haneen Mohammed <hamohammed.sa@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20180913130254.GA156437@art_vandelay
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/intel_display.h index e20e6a36a748..ed474da6c200 100644 --- a/drivers/gpu/drm/i915/intel_display.h +++ b/drivers/gpu/drm/i915/intel_display.h @@ -25,6 +25,8 @@ #ifndef _INTEL_DISPLAY_H_ #define _INTEL_DISPLAY_H_ +#include <drm/drm_util.h> + enum i915_gpio { GPIOA, GPIOB, |