Daniel Vetter ff5f4b0585 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>

2012-02-23 14:56:11 +01:00

..

dvo_ch7xxx.c

…

dvo_ch7017.c

…

dvo_ivch.c

…

dvo_sil164.c

…

dvo_tfp410.c

…

dvo.h

…

i915_debugfs.c

drm/i915: Record the position of the request upon error

2012-02-15 14:27:18 +01:00

i915_dma.c

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

2012-02-23 14:56:11 +01:00

i915_drv.c

drm/i915: check gtfifodbg after possibly failed writes

2012-02-12 00:21:41 +01:00

i915_drv.h

drm/i915: Record the position of the request upon error

2012-02-15 14:27:18 +01:00

i915_gem_debug.c

…

i915_gem_evict.c

drm/i915: argument to control retiring behavior

2012-01-26 11:19:19 +01:00

i915_gem_execbuffer.c

Merge tag 'drm-intel-next-2012-02-07' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next

2012-02-14 14:16:00 +00:00

i915_gem_gtt.c

drm/i915: ppgtt binding/unbinding support

2012-02-09 21:25:23 +01:00

i915_gem_tiling.c

drm/i915: swizzling support for snb/ivb

2012-02-08 23:16:24 +01:00

i915_gem.c

drm/i915: Record the tail at each request and use it to estimate the head

2012-02-15 14:26:03 +01:00

i915_ioc32.c

…

i915_irq.c

drm/i915: Record the position of the request upon error

2012-02-15 14:27:18 +01:00

i915_reg.h

drm/i915: add missing SDVO bits for interlaced modes on ILK

2012-02-14 20:32:29 +01:00

i915_suspend.c

drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.

2012-01-24 13:25:10 -08:00

i915_trace_points.c

…

i915_trace.h

…

intel_acpi.c

drm/i915: Silence _DSM errors

2012-01-16 21:08:19 +01:00

intel_bios.c

drm/i915: Use kcalloc instead of kzalloc to allocate array

2012-01-17 17:33:24 +01:00

intel_bios.h

drm/i915: VBT Parser cleanup for eDP block

2012-01-13 08:37:44 -08:00

intel_crt.c

drm/i915: don't allow interlaced pipeconf on gen2

2012-02-10 17:28:45 +01:00

intel_display.c

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

2012-02-23 14:56:11 +01:00

intel_dp.c

Merge remote-tracking branch 'airlied/drm-fixes' into drm-intel-next-queued

2012-02-10 17:14:49 +01:00

intel_drv.h

drm/i915: Separate fence pin counting from normal bind pin counting

2012-01-29 18:23:37 +01:00

intel_dvo.c

drm/i915: fixup interlaced vertical timings confusion, part 1

2012-02-10 17:24:06 +01:00

intel_fb.c

drm: do not set fb_info->pixmap fields

2012-02-09 10:34:43 +00:00

intel_hdmi.c

drm/i915: add a "force-dvi" HDMI audio mode

2012-02-14 10:03:18 +01:00

intel_i2c.c

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

2012-02-23 14:56:11 +01:00

intel_lvds.c

drm/i915/lvds: Always use the presence pin for LVDS on PCH

2012-02-15 16:41:34 +01:00

intel_modes.c

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

2012-02-23 14:56:11 +01:00

intel_opregion.c

…

intel_overlay.c

Revert "drivers/gpu/drm/i915/intel_overlay.c needs seq_file.h"

2012-02-16 10:31:23 +01:00

intel_panel.c

drm/i915: fixup interlaced vertical timings confusion, part 1

2012-02-10 17:24:06 +01:00

intel_ringbuffer.c

drm/i915: Record the tail at each request and use it to estimate the head

2012-02-15 14:26:03 +01:00

intel_ringbuffer.h

drm/i915: Record the tail at each request and use it to estimate the head

2012-02-15 14:26:03 +01:00

intel_sdvo_regs.h

…

intel_sdvo.c

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

2012-02-23 14:56:11 +01:00

intel_sprite.c

Merge tag 'drm-intel-next-2012-02-07' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next

2012-02-14 14:16:00 +00:00

intel_tv.c

drm/i915: fixup interlaced vertical timings confusion, part 1

2012-02-10 17:24:06 +01:00

Makefile

drm/i915: kill i915_mem.c

2012-01-17 20:01:01 +01:00