diff options
| author | Joonas Lahtinen | 2019-02-20 10:27:15 +0100 |
|---|---|---|
| committer | Joonas Lahtinen | 2019-02-20 10:53:48 +0100 |
| commit | b08e776c223c5faa2f2768d5e597cf6549445593 (patch) | |
| tree | 05039e6ddc9774d9e02595033909aa4e33dd4e9e /drivers/gpu/drm/i915/intel_display.h | |
| parent | Merge drm/drm-next into drm-intel-next-queued (diff) | |
| parent | drm/audio: declaration of struct device (diff) | |
| download | kernel-qcow2-linux-b08e776c223c5faa2f2768d5e597cf6549445593.tar.gz kernel-qcow2-linux-b08e776c223c5faa2f2768d5e597cf6549445593.tar.xz kernel-qcow2-linux-b08e776c223c5faa2f2768d5e597cf6549445593.zip | |
Merge tag 'topic/mei-hdcp-2019-02-19' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next-queued
Prep patches + headers for the mei-hdcp/i915 component interfaces
Also contains the prep work in the component helpers plus adjustements
for the snd-hda/i915 component interface.
Plus one small static inline in the drm_hdcp.h header that both i915
and mei_hdcp will need.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190219071619.GA11016@phenom.ffwll.local
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/intel_display.h index c7c068662288..2220588e86ac 100644 --- a/drivers/gpu/drm/i915/intel_display.h +++ b/drivers/gpu/drm/i915/intel_display.h @@ -26,6 +26,7 @@ #define _INTEL_DISPLAY_H_ #include <drm/drm_util.h> +#include <drm/i915_drm.h> enum i915_gpio { GPIOA, @@ -150,21 +151,6 @@ enum plane_id { for ((__p) = PLANE_PRIMARY; (__p) < I915_MAX_PLANES; (__p)++) \ for_each_if((__crtc)->plane_ids_mask & BIT(__p)) -enum port { - PORT_NONE = -1, - - PORT_A = 0, - PORT_B, - PORT_C, - PORT_D, - PORT_E, - PORT_F, - - I915_MAX_PORTS -}; - -#define port_name(p) ((p) + 'A') - /* * Ports identifier referenced from other drivers. * Expected to remain stable over time |