drm/i915: enum port definition is moved into i915_drm.h (8605a136) · Commits · 戴 / test

For the reusability of the enum port in other driver modules (like mei_hdcp), enum port definition is moved from I915 local header intel_display.h to drm/i915_drm.h Signed-off-by:

Ramalingam C <ramalingam.c@intel.com> Acked-by:

Daniel Vetter <daniel.vetter@ffwll.ch> [danvet: Fix subject prefix.] Signed-off-by:

Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/1550219730-17734-3-git-send-email-ramalingam.c@intel.com

drivers/gpu/drm/i915/intel_display.h

+1 −15

Original line number	Diff line number	Diff line
		@@ -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

include/drm/i915_drm.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -100,4 +100,19 @@ extern struct resource intel_graphics_stolen_res;
		#define INTEL_GEN11_BSM_DW1 0xc4
		#define INTEL_BSM_MASK (-(1u << 20))

		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')

		#endif /* _I915_DRM_H_ */

Admin message