Merge remote-tracking branch 'airlied/drm-next' into for-airlied

Manually resolve the conflict between the new enum drm property
helpers in drm-next and the new "force-dvi" option that the "audio" output
property gained in drm-intel-next.

While resolving this conflict, switch the new drm_prop_enum_list to
use the newly introduced enum defines instead of magic values.

Conflicts:
	drivers/gpu/drm/i915/intel_modes.c

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_i2c.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_modes.c
index 7be46163f421d06079a470383ac5a287779e9be0,961f75dbeae1e2a1b3e7b6da67e3fc846bf7e6c6..2978a3f61b58f5fea08ddb660b98f96e5c3ff5f1
--- 1/drivers/gpu/drm/i915/intel_modes.c
--- 2/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@@ -83,11 -83,10 +83,11 @@@ int intel_ddc_get_modes(struct drm_conn
        return ret;
  }
  
- static const char *force_audio_names[] = {
-       "force-dvi",
-       "off",
-       "auto",
-       "on",
+ static const struct drm_prop_enum_list force_audio_names[] = {
 -      { -1, "off" },
 -      {  0, "auto" },
 -      {  1, "on" },
++      { HDMI_AUDIO_OFF_DVI, "force-dvi" },
++      { HDMI_AUDIO_OFF, "off" },
++      { HDMI_AUDIO_AUTO, "auto" },
++      { HDMI_AUDIO_ON, "on" },
  };
  
  void

diff --cc drivers/gpu/drm/i915/intel_sdvo.c
Simple merge

diff --cc drivers/gpu/drm/radeon/evergreen.c
Simple merge