evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
android_kernel_oneplus_msm8998/drivers/gpu/drm/i915
History
Daniel Vetter 0d4a42f6bd Linux 3.9-rc3 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQEcBAABAgAGBQJRRkrbAAoJEHm+PkMAQRiGy3oH/jrbHinYs0auurANgx4TdtWT
 /WNajstKBqLOJJ6cnTR7sOqwOVlptt65EbbTs+qGyZ2Z2W/Lg0BMenHvNHo4ER8C
 e7UbMdBCSLKBjAMKh1XCoZscGv4Exm8WRH3Vc5yP0Hafj3EzSAVLY1dta9WKKoQi
 bh7D1ErUlbU1zczA1w5YbPF0LqFKRvyZOwebMCCAKAxv5wWAxmbcPNxVR4sufkjg
 k6TkQ2ysgWivZAfy3tJYOcxiEu7ahpZVEuYdlZEJQXHRQUfoNljQlOp4BqKsYUai
 5A0kaf2VpKay/7pkhvTfBBcF/jFJ68pYP6gQ2ThNdr0b5kOiAfMWj030Xyngnhg=
 =iO9t
 -----END PGP SIGNATURE-----

Merge tag 'v3.9-rc3' into drm-intel-next-queued

Backmerge so that I can merge Imre Deak's coalesced sg entries fixes,
which depend upon the new for_each_sg_page introduce in

commit a321e91b6d
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Feb 27 17:02:56 2013 -0800

    lib/scatterlist: add simple page iterator

The merge itself is just two trivial conflicts:

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-03-19 09:47:30 +01:00
..
dvo.h
dvo_ch7xxx.c
dvo_ch7017.c
dvo_ivch.c
dvo_ns2501.c
dvo_sil164.c
dvo_tfp410.c
i915_debugfs.c Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
i915_dma.c drm/i915: clear the FPGA_DBG_RM_NOCLAIM bit at driver init 2013-02-20 01:33:48 +01:00
i915_drv.c Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
i915_drv.h drm/i915: add HAS_POWER_WELL 2013-03-17 21:49:23 +01:00
i915_gem.c Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
i915_gem_context.c drm/i915: convert to idr_alloc() 2013-02-27 19:10:16 -08:00
i915_gem_debug.c
i915_gem_dmabuf.c Merge tag 'drm-intel-next-2012-12-21' of git://people.freedesktop.org/~danvet/drm-intel into drm-next 2013-01-17 20:34:08 +10:00
i915_gem_evict.c drm/i915: Create a gtt structure 2013-01-17 22:33:56 +01:00
i915_gem_execbuffer.c drm/i915: Remove unneeded dev argument 2013-03-18 03:03:19 +01:00
i915_gem_gtt.c drm/i915: use gen6 stolen check on VLV 2013-03-06 20:07:03 +01:00
i915_gem_stolen.c drm/i915: remove intel_gtt structure 2013-01-31 11:50:07 +01:00
i915_gem_tiling.c drm/i915: Create a gtt structure 2013-01-17 22:33:56 +01:00
i915_ioc32.c
i915_irq.c Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
i915_reg.h Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
i915_suspend.c drm/i915: don't save/restore PCH_LVDS on LPT 2013-03-17 21:53:10 +01:00
i915_sysfs.c drm/i915: add \n to the end of sysfs attributes 2013-02-20 01:33:44 +01:00
i915_trace.h
i915_trace_points.c
i915_ums.c drm/i915: move DP save/restore into i915_ums.c 2013-01-31 11:50:04 +01:00
intel_acpi.c
intel_bios.c Merge branch 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next 2012-12-10 20:03:58 +10:00
intel_bios.h
intel_crt.c Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next 2013-03-07 11:12:14 +10:00
intel_ddi.c Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
intel_display.c Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
intel_dp.c Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
intel_drv.h Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
intel_dvo.c drm/i915: rip out helper->disable noop functions 2013-02-14 00:07:54 +01:00
intel_fb.c Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
intel_hdmi.c Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
intel_i2c.c drm/i915: GPIO/GMBUS registers need an offset on VLV 2013-01-24 23:45:03 +01:00
intel_lvds.c Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
intel_modes.c drm/i915: Add "Automatic" mode for the "Broadcast RGB" property 2013-01-20 13:09:44 +01:00
intel_opregion.c GPU/i915: Fix acpi_bus_get_device() check in drivers/gpu/drm/i915/intel_opregion.c 2013-02-01 11:01:50 +01:00
intel_overlay.c Merge tag 'drm-intel-next-2013-02-01' of git://people.freedesktop.org/~danvet/drm-intel into drm-next 2013-02-08 11:08:10 +10:00
intel_panel.c drm/i915: write backlight harder 2013-02-15 10:30:36 +01:00
intel_pm.c Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
intel_ringbuffer.c drm/i915: Fix PIPE_CONTROL DW/QW write through global GTT on IVB+ 2013-02-20 00:21:47 +01:00
intel_ringbuffer.h Merge tag 'drm-intel-next-2012-12-21' of git://people.freedesktop.org/~danvet/drm-intel into drm-next 2013-01-17 20:34:08 +10:00
intel_sdvo.c Linux 3.9-rc3 2013-03-19 09:47:30 +01:00
intel_sdvo_regs.h
intel_sprite.c drm/i915: Handle untiled planes when computing their offsets 2013-02-21 21:52:08 +01:00
intel_tv.c drm/i915: rip out helper->disable noop functions 2013-02-14 00:07:54 +01:00
Makefile drm/i915: extract ums suspend/resume into i915_ums.c 2013-01-31 11:50:03 +01:00