Chris Wilson bdd92c9ad2 Merge branch 'drm-intel-fixes' into drm-intel-next ...

Merge important suspend and resume regression fixes and resolve the
small conflict.

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

2011-01-24 23:45:32 +00:00

..

dvo_ch7xxx.c

drm/i915: use GMBUS to manage i2c links

2010-09-18 15:46:19 +01:00

dvo_ch7017.c

drm/i915/dvo: Report LVDS attached to ch701x as connected

2010-12-30 13:50:43 +00:00

dvo_ivch.c

drm/i915: use GMBUS to manage i2c links

2010-09-18 15:46:19 +01:00

dvo_sil164.c

drm/i915: use GMBUS to manage i2c links

2010-09-18 15:46:19 +01:00

dvo_tfp410.c

drm/i915: use GMBUS to manage i2c links

2010-09-18 15:46:19 +01:00

dvo.h

drm/i915: Subclass intel_encoder.

2010-08-09 11:24:28 -07:00

i915_debugfs.c

drm/i915: tune Sandy Bridge DRPS constants

2011-01-19 12:57:56 +00:00

i915_dma.c

Merge branch 'drm-intel-fixes' into drm-intel-next

2011-01-24 23:45:32 +00:00

i915_drv.c

Merge branch 'drm-intel-fixes' into drm-intel-next

2011-01-24 23:45:32 +00:00

i915_drv.h

Merge branch 'drm-intel-fixes' into drm-intel-next

2011-01-24 23:45:32 +00:00

i915_gem_debug.c

drm/i915: Use drm_i915_gem_object as the preferred type

2010-11-23 20:19:10 +00:00

i915_gem_evict.c

drm/i915/evict: Ensure we completely cleanup on failure

2011-01-11 22:55:39 +00:00

i915_gem_execbuffer.c

Merge branch 'drm-intel-fixes' into drm-intel-next

2011-01-24 23:45:32 +00:00

i915_gem_gtt.c

drm/i915,agp/intel: Do not clear stolen entries

2011-01-24 18:26:25 +00:00

i915_gem_tiling.c

drm/i915: Pipelined fencing [infrastructure]

2010-12-02 10:07:05 +00:00

i915_gem.c

drm/i915,agp/intel: Do not clear stolen entries

2011-01-24 18:26:25 +00:00

i915_ioc32.c

drm: convert drm_ioctl to unlocked_ioctl

2009-12-18 11:22:31 +10:00

i915_irq.c

Merge branch 'drm-intel-fixes' into drm-intel-next

2011-01-24 23:45:32 +00:00

i915_mem.c

drm: Remove memory debugging infrastructure.

2009-06-18 13:00:33 -07:00

i915_reg.h

Merge branch 'drm-intel-fixes' into drm-intel-next

2011-01-20 09:41:07 +00:00

i915_suspend.c

drm/i915: cleanup rc6 code

2011-01-11 20:43:59 +00:00

i915_trace_points.c

drm/i915: Add tracepoints

2009-09-23 01:05:21 +01:00

i915_trace.h

drm/i915: Kill the get_fence tracepoint

2010-12-02 10:20:47 +00:00

intel_acpi.c

drm/i915: i915 cannot provide switcher services.

2010-12-08 15:40:44 +10:00

intel_bios.c

drm/i915: Disable SSC for outputs other than LVDS or DP

2011-01-19 13:33:27 +00:00

intel_bios.h

drm/i915: Disable SSC for outputs other than LVDS or DP

2011-01-19 13:33:27 +00:00

intel_crt.c

drm/i915/crt: Check for a analog monitor in case of DVI-I

2011-01-11 20:26:33 +00:00

intel_display.c

Merge branch 'drm-intel-fixes' into drm-intel-next

2011-01-20 09:41:07 +00:00

intel_dp.c

drm/i915: fix calculation of eDP signal levels on Sandybridge

2011-01-11 20:26:54 +00:00

intel_drv.h

drm/i915: Include TLB miss latency in g4x watermark computations

2011-01-19 15:04:42 +00:00

intel_dvo.c

drm/i915/dvo: Fix panel and DDC i2c pins

2010-09-28 23:34:44 +01:00

intel_fb.c

Revert "drm: Update fbdev fb_fix_screeninfo"

2011-01-14 16:10:28 -08:00

intel_hdmi.c

i915: enable AVI infoframe for intel_hdmi.c [v4]

2010-10-22 09:14:30 +01:00

intel_i2c.c

Merge branch 'drm-intel-fixes' into drm-intel-next

2010-11-15 06:49:30 +00:00

intel_lvds.c

drm/i915: Trivial sparse fixes

2011-01-19 12:39:38 +00:00

intel_modes.c

drm/i915: use GMBUS to manage i2c links

2010-09-18 15:46:19 +01:00

intel_opregion.c

Merge branch 'drm-intel-fixes' into drm-intel-next

2011-01-24 23:45:32 +00:00

intel_overlay.c

drm/i915: Implement GPU semaphores for inter-ring synchronisation on SNB

2010-12-05 00:37:38 +00:00

intel_panel.c

drm/i915/panel: The backlight is enabled if the current value is non-zero

2011-01-12 20:24:50 +00:00

intel_ringbuffer.c

Merge branch 'drm-intel-fixes' into drm-intel-next

2011-01-24 23:45:32 +00:00

intel_ringbuffer.h

Merge branch 'drm-intel-fixes' into drm-intel-next

2011-01-24 23:45:32 +00:00

intel_sdvo_regs.h

drm/i915/sdvo: Add missing TV filters

2010-08-09 11:24:29 -07:00

intel_sdvo.c

drm/i915/sdvo: Defer detection of output capabilities until probing

2011-01-11 20:26:55 +00:00

intel_tv.c

drm/i915: Implement GPU semaphores for inter-ring synchronisation on SNB

2010-12-05 00:37:38 +00:00

Makefile

drm/i915: Split i915_gem_execbuffer into its own file.

2010-11-25 21:19:25 +00:00