Daniel Vetter 7f16e5c141 Merge tag 'v3.12' into drm-intel-next ... I want to merge in the new Broadwell support as a late hw enabling pull request. But since the internal branch was based upon our drm-intel-nightly integration branch I need to resolve all the oustanding conflicts in drm/i915 with a backmerge to make the 60+ patches apply properly. We'll propably have some fun because Linus will come up with a slightly different merge solution. Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_crt.c drivers/gpu/drm/i915/intel_ddi.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_dp.c drivers/gpu/drm/i915/intel_drv.h All rather simple adjacent lines changed or partial backports from -next to -fixes, with the exception of the thaw code in i915_dma.c. That one needed a bit of shuffling to restore the intent. Oh and the massive header file reordering in intel_drv.h is a bit trouble. But not much. v2: Also don't forget the fixup for the silent conflict that results in compile fail ... Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2013-11-04 16:28:52 +01:00
..
accel_2d.c	drm: Replace pitch with pitches[] in drm_framebuffer	2011-12-20 10:06:27 +00:00
backlight.c	gma500/cdv: Add eDP support	2012-08-24 09:29:25 +10:00
cdv_device.c	drm/gma500/cdv: Add and hook up chip op for disabling sr	2013-08-15 00:54:44 +02:00
cdv_device.h	drm/gma500/cdv: Add and hook up chip op for disabling sr	2013-08-15 00:54:44 +02:00
cdv_intel_crt.c	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
cdv_intel_display.c	drm/gma500/cdv: Add and hook up chip op for disabling sr	2013-08-15 00:54:44 +02:00
cdv_intel_dp.c	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
cdv_intel_hdmi.c	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
cdv_intel_lvds.c	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
framebuffer.c	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
framebuffer.h	drm/gma500: Rename psb_intel_connector to gma_connector	2013-07-24 01:47:34 +02:00
gem.c	drm: kill ->gem_init_object() and friends	2013-10-09 14:38:02 +10:00
gma_display.c	drm/gma500/cdv: Add and hook up chip op for disabling sr	2013-08-15 00:54:44 +02:00
gma_display.h	drm/gma500/cdv: Add and hook up chip op for disabling sr	2013-08-15 00:54:44 +02:00
gtt.c	drm/gma500: fix things after get/put page helpers	2013-10-09 16:04:32 +10:00
gtt.h	drm/gma500: Add support for rebuilding the gtt	2013-04-07 17:09:05 +02:00
intel_bios.c	drivers: gpu: drm: gma500: Replaced calls kzalloc & memcpy with kmemdup	2013-03-13 22:37:32 +01:00
intel_bios.h	drm/gma500: Clean up various defines	2013-03-17 18:32:56 +01:00
intel_gmbus.c	UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/	2012-10-02 18:01:07 +01:00
intel_i2c.c	gma500: fixup build versus latest header changes.	2011-11-16 12:14:04 +00:00
Kconfig	drm: Add separate Kconfig option for fbdev helpers	2013-10-11 23:36:58 +02:00
Makefile	drm/gma500: Add generic code for clock calculation	2013-07-24 01:47:16 +02:00
mdfld_device.c	gma500: handle poulsbo cursor restriction	2012-05-22 10:15:34 +01:00
mdfld_dsi_dpi.c	drm: Make the .mode_fixup() operations mode argument a const pointer	2012-07-19 21:52:38 -04:00
mdfld_dsi_dpi.h	drm: Make the .mode_fixup() operations mode argument a const pointer	2012-07-19 21:52:38 -04:00
mdfld_dsi_output.c	drm/gma500: Rename psb_intel_crtc to gma_crtc	2013-07-24 01:47:33 +02:00
mdfld_dsi_output.h	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
mdfld_dsi_pkg_sender.c	gma500: use the register map to clean up	2012-05-11 17:35:51 +01:00
mdfld_dsi_pkg_sender.h	gma500: initial medfield merge	2012-03-10 13:05:48 +00:00
mdfld_intel_display.c	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
mdfld_output.c	gma500: mdfld_dsi_output_init() drop unused parameter	2012-03-10 13:05:51 +00:00
mdfld_output.h	gma500: initial medfield merge	2012-03-10 13:05:48 +00:00
mdfld_tmd_vid.c	gma500: initial medfield merge	2012-03-10 13:05:48 +00:00
mdfld_tpo_vid.c	gma500: initial medfield merge	2012-03-10 13:05:48 +00:00
mid_bios.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-10-03 23:29:23 -07:00
mid_bios.h	gma500: Add the glue to the various BIOS and firmware interfaces	2011-11-16 11:25:28 +00:00
mmu.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-03-22 13:08:22 -07:00
oaktrail_crtc.c	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
oaktrail_device.c	gma600: Enable HDMI support	2012-11-07 10:59:32 +10:00
oaktrail_hdmi_i2c.c	i2c: Ignore return value of i2c_del_adapter()	2013-04-02 07:06:03 +02:00
oaktrail_hdmi.c	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
oaktrail_lvds.c	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
oaktrail.h	gma600: Enable HDMI support	2012-11-07 10:59:32 +10:00
opregion.c	gma500/cdv: Add eDP support	2012-08-24 09:29:25 +10:00
opregion.h	gma500: move the ASLE enable	2012-07-16 09:20:33 -07:00
power.c	drm/gma500: Add hooks for hibernation	2013-04-07 17:09:34 +02:00
power.h	drm/gma500: Add hooks for hibernation	2013-04-07 17:09:34 +02:00
psb_device.c	drm/gma500/psb: Make use of generic clock code	2013-07-24 01:47:18 +02:00
psb_device.h	drm/gma500/psb: Make use of generic clock code	2013-07-24 01:47:18 +02:00
psb_drv.c	drm: Make vblank_disable_allowed bool	2013-10-09 15:55:30 +10:00
psb_drv.h	drm: Remove pci_vendor and pci_device from struct drm_device	2013-10-09 15:55:33 +10:00
psb_intel_display.c	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
psb_intel_drv.h	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
psb_intel_lvds.c	drm/gma500: Rename psb_intel_encoder to gma_encoder	2013-07-24 01:49:43 +02:00
psb_intel_modes.c	gma500: Remove psb_intel_output from ddc_probe and ddc_get_modes	2011-12-20 10:23:06 +00:00
psb_intel_reg.h	drm/gma500: Clean up various defines	2013-03-17 18:32:56 +01:00
psb_intel_sdvo_regs.h	gma500: Replace SDVO code with slightly modified version from i915	2011-12-20 10:23:14 +00:00
psb_intel_sdvo.c	Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-next	2013-09-02 09:31:40 +10:00
psb_irq.c	drm: Collect per-crtc vblank stuff to a struct	2013-10-09 15:55:31 +10:00
psb_irq.h	drm/gma500: Clean up various defines	2013-03-17 18:32:56 +01:00
psb_lid.c	gma500: Prevent endless loop in panel power up sequence	2012-05-22 10:15:29 +01:00
psb_reg.h	gma500: Add the core DRM files and headers	2011-11-16 11:26:35 +00:00
tc35876x-dsi-lvds.c	Drivers: gpu: remove __dev* attributes.	2013-01-03 15:57:15 -08:00
tc35876x-dsi-lvds.h	gma500: initial medfield merge	2012-03-10 13:05:48 +00:00