Commit 5734c177 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move enum hpd_pin to intel_display.h 



It's not the ideal location, but a better alternative than
i915_drv.h. The goal is to break the intel_display_types.h to i915_drv.h
dependency.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9f882eff78cdc6b28c18e73f5e53f57e413240dc.1638366969.git.jani.nikula@intel.com
parent f83974a4

drivers/gpu/drm/i915/display/intel_display.h

+24 −0
Original line number Diff line number Diff line
@@ -346,6 +346,30 @@ enum phy_fia { 
	FIA3,

};



enum hpd_pin {

	HPD_NONE = 0,

	HPD_TV = HPD_NONE,     /* TV is known to be unreliable */

	HPD_CRT,

	HPD_SDVO_B,

	HPD_SDVO_C,

	HPD_PORT_A,

	HPD_PORT_B,

	HPD_PORT_C,

	HPD_PORT_D,

	HPD_PORT_E,

	HPD_PORT_TC1,

	HPD_PORT_TC2,

	HPD_PORT_TC3,

	HPD_PORT_TC4,

	HPD_PORT_TC5,

	HPD_PORT_TC6,



	HPD_NUM_PINS

};



#define for_each_hpd_pin(__pin) \

	for ((__pin) = (HPD_NONE + 1); (__pin) < HPD_NUM_PINS; (__pin)++)



#define for_each_pipe(__dev_priv, __p) \

	for ((__p) = 0; (__p) < I915_MAX_PIPES; (__p)++) \

		for_each_if(INTEL_INFO(__dev_priv)->pipe_mask & BIT(__p))

drivers/gpu/drm/i915/i915_drv.h

+0 −24
Original line number Diff line number Diff line
@@ -117,30 +117,6 @@ 


struct drm_i915_gem_object;



enum hpd_pin {

	HPD_NONE = 0,

	HPD_TV = HPD_NONE,     /* TV is known to be unreliable */

	HPD_CRT,

	HPD_SDVO_B,

	HPD_SDVO_C,

	HPD_PORT_A,

	HPD_PORT_B,

	HPD_PORT_C,

	HPD_PORT_D,

	HPD_PORT_E,

	HPD_PORT_TC1,

	HPD_PORT_TC2,

	HPD_PORT_TC3,

	HPD_PORT_TC4,

	HPD_PORT_TC5,

	HPD_PORT_TC6,



	HPD_NUM_PINS

};



#define for_each_hpd_pin(__pin) \

	for ((__pin) = (HPD_NONE + 1); (__pin) < HPD_NUM_PINS; (__pin)++)



/* Threshold == 5 for long IRQs, 50 for short */

#define HPD_STORM_DEFAULT_THRESHOLD 50