Eric Anholt 34dc4d4423 Merge remote branch 'origin/master' into drm-intel-next ...

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/radeon/r300.c

The BSD ringbuffer support that is landing in this branch
significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
and requires it to be tested successfully anyway.

2010-05-10 13:36:52 -07:00

..

dvo_ch7xxx.c

drm/i915: Remove dead KMS encoder save/restore code.

2010-04-12 09:23:30 -07:00

dvo_ch7017.c

drm/i915: Remove dead KMS encoder save/restore code.

2010-04-12 09:23:30 -07:00

dvo_ivch.c

drm/i915: Remove dead KMS encoder save/restore code.

2010-04-12 09:23:30 -07:00

dvo_sil164.c

drm/i915: Remove dead KMS encoder save/restore code.

2010-04-12 09:23:30 -07:00

dvo_tfp410.c

drm/i915: Remove dead KMS encoder save/restore code.

2010-04-12 09:23:30 -07:00

dvo.h

drm/i915: Remove dead KMS encoder save/restore code.

2010-04-12 09:23:30 -07:00

i915_debugfs.c

drm/i915: Make fbc control wrapper functions

2010-05-07 13:59:29 -07:00

i915_dma.c

Merge remote branch 'origin/master' into drm-intel-next

2010-05-10 13:36:52 -07:00

i915_drv.c

Merge remote branch 'origin/master' into drm-intel-next

2010-05-10 13:36:52 -07:00

i915_drv.h

Merge remote branch 'origin/master' into drm-intel-next

2010-05-10 13:36:52 -07:00

i915_gem_debug.c

drm/i915: drop pointer to drm_gem_object

2010-04-20 13:23:14 +10:00

i915_gem_tiling.c

drm/i915: fix tiling limits for i915 class hw v2

2010-04-18 17:58:24 -07:00

i915_gem.c

Merge remote branch 'origin/master' into drm-intel-next

2010-05-10 13:36:52 -07:00

i915_ioc32.c

drm: convert drm_ioctl to unlocked_ioctl

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

i915_irq.c

Merge remote branch 'origin/master' into drm-intel-next

2010-05-10 13:36:52 -07:00

i915_mem.c

drm: Remove memory debugging infrastructure.

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

i915_opregion.c

drm/i915: set DIDL using the ACPI video output device _ADR method return.

2010-04-18 17:05:13 -07:00

i915_reg.h

Merge remote branch 'origin/master' into drm-intel-next

2010-05-10 13:36:52 -07:00

i915_suspend.c

drm/i915: Only save/restore FBC on the platform that supports FBC

2010-04-12 09:25:54 -07:00

i915_trace_points.c

drm/i915: Add tracepoints

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

i915_trace.h

drm/i915: Convert some trace events to DEFINE_TRACE

2010-04-09 14:16:34 -07:00

intel_bios.c

drivers/gpu/drm/i915/intel_bios.c: fix continuation line formats

2010-03-17 13:06:09 -07:00

intel_bios.h

drm/i915: parse eDP panel color depth from VBT block

2010-01-15 14:12:47 -08:00

intel_crt.c

Merge remote branch 'anholt/drm-intel-next' of /home/airlied/kernel/drm-next into drm-core-next

2010-04-20 13:11:45 +10:00

intel_display.c

Merge remote branch 'origin/master' into drm-intel-next

2010-05-10 13:36:52 -07:00

intel_dp.c

Merge remote branch 'anholt/drm-intel-next' of /home/airlied/kernel/drm-next into drm-core-next

2010-04-20 13:11:45 +10:00

intel_drv.h

Merge branch 'drm-fbdev-cleanup' into drm-core-next

2010-04-20 13:16:04 +10:00

intel_dvo.c

Merge remote branch 'anholt/drm-intel-next' of /home/airlied/kernel/drm-next into drm-core-next

2010-04-20 13:11:45 +10:00

intel_fb.c

drm/i915: introduce i915_gem_alloc_object

2010-04-20 13:22:26 +10:00

intel_hdmi.c

Merge remote branch 'anholt/drm-intel-next' of /home/airlied/kernel/drm-next into drm-core-next

2010-04-20 13:11:45 +10:00

intel_i2c.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

intel_lvds.c

Merge remote branch 'anholt/drm-intel-next' of /home/airlied/kernel/drm-next into drm-core-next

2010-04-20 13:11:45 +10:00

intel_modes.c

Merge remote branch 'anholt/drm-intel-next' of /home/airlied/kernel/drm-next into drm-core-next

2010-04-20 13:11:45 +10:00

intel_overlay.c

drm/i915: drop pointer to drm_gem_object

2010-04-20 13:23:14 +10:00

intel_sdvo_regs.h

drm/i915: enable sdvo lvds scaling function.

2009-07-01 11:44:45 -07:00

intel_sdvo.c

Merge remote branch 'anholt/drm-intel-next' of /home/airlied/kernel/drm-next into drm-core-next

2010-04-20 13:11:45 +10:00

intel_tv.c

Revert "drm/i915: Configure the TV sense state correctly on GM45 to make TV detection reliable"

2010-04-20 14:25:51 +10:00

Makefile

Merge remote branch 'anholt/drm-intel-next' into drm-linus

2009-12-08 14:03:47 +10:00