drm/i915: move property enums to intel_display_types.h

Move the property enums closer to home. Acually make the broadcast
macros an enum while at it.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/589d5449a504ec9742dc1fa8d4871d0d6d0cddca.1565085692.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 3283f8d5c4e001d8a312043e0fb767c53ee24f52..a88ec9aa9ca05425b509af927fdc4786d974741e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -68,6 +68,20 @@ enum intel_output_type {
        INTEL_OUTPUT_DP_MST = 11,
 };
 
+enum hdmi_force_audio {
+       HDMI_AUDIO_OFF_DVI = -2,        /* no aux data for HDMI-DVI converter */
+       HDMI_AUDIO_OFF,                 /* force turn off HDMI audio */
+       HDMI_AUDIO_AUTO,                /* trust EDID */
+       HDMI_AUDIO_ON,                  /* force turn on HDMI audio */
+};
+
+/* "Broadcast RGB" property */
+enum intel_broadcast_rgb {
+       INTEL_BROADCAST_RGB_AUTO,
+       INTEL_BROADCAST_RGB_FULL,
+       INTEL_BROADCAST_RGB_LIMITED,
+};
+
 struct intel_framebuffer {
        struct drm_framebuffer base;
        struct intel_rotation_info rot_info;

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index cfb0aa1e4885c1700e65db2db92d1320fbef0c72..fad387a67acfdf94d7637af2f9e12649d4864423 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1934,13 +1934,6 @@ static inline struct drm_i915_private *wopcm_to_i915(struct intel_wopcm *wopcm)
             (engine__); \
             (engine__) = rb_to_uabi_engine(rb_next(&(engine__)->uabi_node)))
 
-enum hdmi_force_audio {
-       HDMI_AUDIO_OFF_DVI = -2,        /* no aux data for HDMI-DVI converter */
-       HDMI_AUDIO_OFF,                 /* force turn off HDMI audio */
-       HDMI_AUDIO_AUTO,                /* trust EDID */
-       HDMI_AUDIO_ON,                  /* force turn on HDMI audio */
-};
-
 #define I915_GTT_OFFSET_NONE ((u32)-1)
 
 /*
@@ -2691,11 +2684,6 @@ int i915_reg_read_ioctl(struct drm_device *dev, void *data,
 #define I915_READ_FW(reg__) __I915_REG_OP(read_fw, dev_priv, (reg__))
 #define I915_WRITE_FW(reg__, val__) __I915_REG_OP(write_fw, dev_priv, (reg__), (val__))
 
-/* "Broadcast RGB" property */
-#define INTEL_BROADCAST_RGB_AUTO 0
-#define INTEL_BROADCAST_RGB_FULL 1
-#define INTEL_BROADCAST_RGB_LIMITED 2
-
 void i915_memcpy_init_early(struct drm_i915_private *dev_priv);
 bool i915_memcpy_from_wc(void *dst, const void *src, unsigned long len);