Daniel Vetter 7b0cfee1a2 Merge tag 'v3.5-rc4' into drm-intel-next-queued ...

I want to merge the "no more fake agp on gen6+" patches into
drm-intel-next (well, the last pieces). But a patch in 3.5-rc4 also
adds a new use of dev->agp. Hence the backmarge to sort this out, for
otherwise drm-intel-next merged into Linus' tree would conflict in the
relevant code, things would compile but nicely OOPS at driver load :(

Conflicts in this merge are just simple cases of "both branches
changed/added lines at the same place". The only tricky part is to
keep the order correct wrt the unwind code in case of errors in
intel_ringbuffer.c (and the MI_DISPLAY_FLIP #defines in i915_reg.h
together, obviously).

Conflicts:
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_ringbuffer.c

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

2012-06-25 19:10:36 +02:00

..

dvo_ch7xxx.c

Drivers: i915: Fix all space related issues.

2011-09-19 18:01:47 -07:00

dvo_ch7017.c

Drivers: i915: Fix all space related issues.

2011-09-19 18:01:47 -07:00

dvo_ivch.c

Drivers: i915: Fix all space related issues.

2011-09-19 18:01:47 -07:00

dvo_sil164.c

Drivers: i915: Fix all space related issues.

2011-09-19 18:01:47 -07:00

dvo_tfp410.c

Drivers: i915: Fix all space related issues.

2011-09-19 18:01:47 -07:00

dvo.h

drm/i915: Subclass intel_encoder.

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

i915_debugfs.c

drm/i915: add ccid to error state

2012-06-14 17:36:19 +02:00

i915_dma.c

drm/i915: initialize the context idr unconditionally

2012-06-20 11:15:37 +02:00

i915_drv.c

Merge tag 'v3.5-rc4' into drm-intel-next-queued

2012-06-25 19:10:36 +02:00

i915_drv.h

Merge tag 'v3.5-rc4' into drm-intel-next-queued

2012-06-25 19:10:36 +02:00

i915_gem_context.c

drm/i915: return -ENODEV if hw context are not supported

2012-06-20 11:19:20 +02:00

i915_gem_debug.c

drm/i915: stop using dev->agp->base

2012-06-12 22:18:06 +02:00

i915_gem_dmabuf.c

i915: add dma-buf vmap support for exporting vmapped buffer

2012-05-31 14:13:57 +01:00

i915_gem_evict.c

drm/i915: Introduce for_each_ring() macro

2012-05-19 22:39:53 +02:00

i915_gem_execbuffer.c

drm/i915: disable flushing_list/gpu_write_list

2012-06-20 13:54:28 +02:00

i915_gem_gtt.c

i915: add dmabuf/prime buffer sharing support.

2012-05-23 10:47:10 +01:00

i915_gem_stolen.c

drm/i915: Split the stolen handling for GEM out of i915_dma.c

2012-05-03 11:18:11 +02:00

i915_gem_tiling.c

drm/i915: Only the zap the VMA after updating the tiling parameters

2012-05-03 11:18:07 +02:00

i915_gem.c

drm/i915: disable flushing_list/gpu_write_list

2012-06-20 13:54:28 +02:00

i915_ioc32.c

drm/i915: [sparse] trivial sparse fixes

2012-04-18 10:34:49 +02:00

i915_irq.c

Merge tag 'v3.5-rc4' into drm-intel-next-queued

2012-06-25 19:10:36 +02:00

i915_reg.h

Merge tag 'v3.5-rc4' into drm-intel-next-queued

2012-06-25 19:10:36 +02:00

i915_suspend.c

drm/i915: gen6_enable_rps() wants to be called after ring initialisation

2012-05-19 22:38:29 +02:00

i915_sysfs.c

drm/i915: simplify sysfs setup code

2012-06-01 10:00:57 +02:00

i915_trace_points.c

drm/i915: [sparse] trivial sparse fixes

2012-04-18 10:34:49 +02:00

i915_trace.h

drm/i915: improve i915_wait_request_begin trace

2012-05-25 09:55:15 +02:00

intel_acpi.c

drm/i915: [sparse] trivial sparse fixes

2012-04-18 10:34:49 +02:00

intel_bios.c

Merge branch 'drm-intel-next' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next

2012-04-12 10:27:01 +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: VLV VGA port only handles on & off, like PCH VGA

2012-06-20 22:49:45 +02:00

intel_ddi.c

drm/i915: add set_infoframes to struct intel_hdmi

2012-05-30 21:36:58 +02:00

intel_display.c

Merge tag 'v3.5-rc4' into drm-intel-next-queued

2012-06-25 19:10:36 +02:00

intel_dp.c

Merge tag 'v3.5-rc4' into drm-intel-next-queued

2012-06-25 19:10:36 +02:00

intel_drv.h

drm/i915: Switch off FBC when disabling the primary plane when obscured

2012-06-13 20:10:00 +02:00

intel_dvo.c

drm/i915/intel_i2c: refactor using intel_gmbus_get_adapter

2012-03-28 14:40:44 +02:00

intel_fb.c

drm/i915: stop using dev->agp->base

2012-06-12 22:18:06 +02:00

intel_hdmi.c

drm/i915: ensure HDMI port is disabled inside set_infoframes

2012-06-12 19:19:52 +02:00

intel_i2c.c

drm/i915: be more careful when returning -ENXIO in gmbus transfer

2012-05-21 21:04:21 +02:00

intel_lvds.c

drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13

2012-06-22 10:41:17 +02:00

intel_modes.c

Merge branch 'drm-intel-next' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next

2012-04-12 10:27:01 +01:00

intel_opregion.c

drm/i915: [sparse] __iomem fixes for opregion

2012-05-03 11:18:00 +02:00

intel_overlay.c

drm/i915: s/i915_wait_request/i915_wait_seqno/g

2012-05-25 14:18:42 +02:00

intel_panel.c

drm/i915: properly enable the blc controller on the right pipe

2012-06-12 19:27:58 +02:00

intel_pm.c

drm/i915: enable display messages to GT on ValleyView

2012-06-20 22:52:42 +02:00

intel_ringbuffer.c

Merge tag 'v3.5-rc4' into drm-intel-next-queued

2012-06-25 19:10:36 +02:00

intel_ringbuffer.h

drm/i915: disable flushing_list/gpu_write_list

2012-06-20 13:54:28 +02:00

intel_sdvo_regs.h

drm/i915: properly handle interlaced bit for sdvo dtd conversion

2012-05-24 17:53:52 +02:00

intel_sdvo.c

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

2012-06-01 10:52:54 +02:00

intel_sprite.c

drm/i915: Switch off FBC when disabling the primary plane when obscured

2012-06-13 20:10:00 +02:00

intel_tv.c

drm/i915: Adding TV Out Missing modes.

2012-05-24 17:54:08 +02:00

Makefile

drm/i915: preliminary context support

2012-06-14 17:36:16 +02:00