From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 23 Feb 2012 13:54:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'airlied/drm-next' into for-airlied
X-Git-Tag: v3.4-rc1~141^2~19^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1;p=platform%2Fkernel%2Flinux-exynos.git

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

ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1
diff --cc drivers/gpu/drm/i915/intel_modes.c
index 7be4616,961f75d..2978a3f
--- a/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