Daniel Vetter a22ddff8be Merge tag 'v3.6-rc2' into drm-intel-next ...

Backmerge Linux 3.6-rc2 to resolve a few funny conflicts before we put
even more madness on top:

- drivers/gpu/drm/i915/i915_irq.c: Just a spurious WARN removed in
  -fixes, that has been changed in a variable-rename in -next, too.

- drivers/gpu/drm/i915/intel_ringbuffer.c: -next remove scratch_addr
  (since all their users have been extracted in another fucntion),
  -fixes added another user for a hw workaroudn.

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

2012-08-17 09:01:08 +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_ns2501.c

drm/i915: Support for ns2501-DVO

2012-07-25 18:23:48 +02: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: Support for ns2501-DVO

2012-07-25 18:23:48 +02:00

i915_debugfs.c

drm/i915: don't grab dev->struct_mutex for userspace forcewak

2012-08-12 11:28:49 +02:00

i915_dma.c

drm/i915: move all rps state into dev_priv->rps

2012-08-09 21:52:22 +02:00

i915_drv.c

Merge tag 'v3.6-rc2' into drm-intel-next

2012-08-17 09:01:08 +02:00

i915_drv.h

drm/i915: kill dev_priv->mchdev_lock

2012-08-09 21:53:01 +02:00

i915_gem_context.c

drm/i915: remove unused variable

2012-08-05 22:39:53 +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: Segregate memory domains in the GTT using coloring

2012-07-26 12:56:25 +02:00

i915_gem_execbuffer.c

Merge tag 'v3.6-rc2' into drm-intel-next

2012-08-17 09:01:08 +02:00

i915_gem_gtt.c

Merge tag 'v3.6-rc2' into drm-intel-next

2012-08-17 09:01:08 +02: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: Lazily apply the SNB+ seqno w/a

2012-08-10 11:11:32 +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.6-rc2' into drm-intel-next

2012-08-17 09:01:08 +02:00

i915_reg.h

drm/i915: add parentheses around PIXCLK_GATE definitions

2012-08-09 18:42:09 +02:00

i915_suspend.c

Merge tag 'v3.5-rc7' into drm-next

2012-07-20 00:53:28 -04:00

i915_sysfs.c

Merge tag 'v3.6-rc2' into drm-intel-next

2012-08-17 09:01:08 +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

drm/i915/bios: cleanup return type of intel_parse_bios()

2012-06-27 10:17:51 +01:00

intel_bios.h

drm/i915/bios: cleanup return type of intel_parse_bios()

2012-06-27 10:17:51 +01:00

intel_crt.c

drm/i915: add inte_crt->adpa_reg

2012-07-25 18:23:50 +02:00

intel_ddi.c

drm/i915: try harder to find WR PLL clock settings

2012-08-10 18:35:28 +02:00

intel_display.c

Merge tag 'v3.6-rc2' into drm-intel-next

2012-08-17 09:01:08 +02:00

intel_dp.c

Merge tag 'v3.6-rc2' into drm-intel-next

2012-08-17 09:01:08 +02:00

intel_drv.h

Merge tag 'v3.6-rc2' into drm-intel-next

2012-08-17 09:01:08 +02:00

intel_dvo.c

drm/i915: Support for ns2501-DVO

2012-07-25 18:23:48 +02:00

intel_fb.c

drm/i915: Zero initialize mode_cmd

2012-07-05 13:27:58 +02:00

intel_hdmi.c

drm/i915: add port parameter to intel_hdmi_init

2012-07-25 18:23:47 +02:00

intel_i2c.c

drm/i915: ensure i2c adapter is all set before adding it

2012-08-13 19:04:24 +02:00

intel_lvds.c

drm/i915: simplify possible_clones computation

2012-07-25 18:23:46 +02:00

intel_modes.c

drm/i915: kill intel_ddc_probe

2012-07-20 12:21:39 +02: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: Fix blank panel at reopening lid

2012-08-11 21:15:16 +02:00

intel_pm.c

Merge tag 'v3.6-rc2' into drm-intel-next

2012-08-17 09:01:08 +02:00

intel_ringbuffer.c

Merge tag 'v3.6-rc2' into drm-intel-next

2012-08-17 09:01:08 +02:00

intel_ringbuffer.h

drm/i915: Lazily apply the SNB+ seqno w/a

2012-08-10 11:11:32 +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 tag 'v3.6-rc2' into drm-intel-next

2012-08-17 09:01:08 +02:00

intel_sprite.c

drm/i915: mask tiled bit when updating ILK sprites

2012-07-20 12:21:40 +02:00

intel_tv.c

drm/i915: simplify possible_clones computation

2012-07-25 18:23:46 +02:00

Makefile

drm/i915: Support for ns2501-DVO

2012-07-25 18:23:48 +02:00