linux/drivers/gpu/drm/i915
Dave Airlie 1bd049fa89 Merge branch 'drm-core-next' into drm-linus
Bring all core drm changes into 2.6.32 tree and resolve
the conflict that occurs.

Conflicts:
	drivers/gpu/drm/drm_fb_helper.c
2009-12-08 13:52:41 +10:00
..
dvo_ch7xxx.c drm/i915: Change I2C api to pass around i2c_adapters 2009-06-18 15:53:57 -07:00
dvo_ch7017.c drm/i915: Change I2C api to pass around i2c_adapters 2009-06-18 15:53:57 -07:00
dvo_ivch.c drm/i915: Change I2C api to pass around i2c_adapters 2009-06-18 15:53:57 -07:00
dvo_sil164.c drm/i915: Change I2C api to pass around i2c_adapters 2009-06-18 15:53:57 -07:00
dvo_tfp410.c drm/i915: Change I2C api to pass around i2c_adapters 2009-06-18 15:53:57 -07:00
dvo.h drm/i915: Change I2C api to pass around i2c_adapters 2009-06-18 15:53:57 -07:00
i915_debugfs.c drm/i915: Avoid potential sleep whilst holding spinlock 2009-11-05 13:33:22 -08:00
i915_dma.c drm/i915: disable FBC for Pineview, fixing a boot hang. 2009-10-13 10:09:26 -07:00
i915_drv.c drm: Add async event synchronization for drmWaitVblank 2009-11-18 10:02:47 +10:00
i915_drv.h drm/i915: Add more registers save/restore for Ironlake suspend 2009-11-12 11:21:14 -08:00
i915_gem_debug.c drm/i915: Catch up to obj_priv->page_list rename in disabled debug code. 2009-06-22 20:19:39 -07:00
i915_gem_tiling.c drm/i915: get the bridge device once. 2009-09-08 11:45:15 +10:00
i915_gem.c drm/i915: Enable irq to trace batch buffer completion. 2009-09-29 03:15:25 +01:00
i915_ioc32.c
i915_irq.c drm/i915: Fix IRQ stall issue on Ironlake 2009-11-12 11:16:33 -08:00
i915_mem.c drm: Remove memory debugging infrastructure. 2009-06-18 13:00:33 -07:00
i915_opregion.c drm/i915: fix opregion backlight chip detect and range 2009-09-17 14:32:08 -07:00
i915_reg.h drm/i915: add FIFO watermark support for G4x 2009-10-23 11:31:08 -07:00
i915_suspend.c drm/i915: Add more registers save/restore for Ironlake suspend 2009-11-12 11:21:14 -08:00
i915_trace_points.c drm/i915: Add tracepoints 2009-09-23 01:05:21 +01:00
i915_trace.h drm/i915: Enable irq to trace batch buffer completion. 2009-09-29 03:15:25 +01:00
intel_bios.c drm/i915: Fix render reclock availability detection. 2009-10-13 10:41:58 -07:00
intel_bios.h drm/i915: Add eDP support on IGDNG mobile chip 2009-07-29 15:16:19 -07:00
intel_crt.c drm/i915: Fix CRT hotplug detect by checking really no channels attached 2009-11-25 12:10:18 -08:00
intel_display.c Merge branch 'drm-core-next' into drm-linus 2009-12-08 13:52:41 +10:00
intel_dp.c drm/intel: refactor DP i2c support and DP common header to drm helper 2009-12-08 09:24:23 +10:00
intel_drv.h Merge branch 'drm-next' of ../drm-next into drm-linus 2009-10-08 14:03:05 +10:00
intel_dvo.c drm/i915: Set crtc/clone mask in different output devices 2009-08-24 17:01:33 -07:00
intel_fb.c drm/fb: add more correct 8/16/24/32 bpp fb support. 2009-10-06 13:54:01 +10:00
intel_hdmi.c drm/i915: HDMI hardware workaround for Ironlake 2009-11-05 14:03:28 -08:00
intel_i2c.c drm/i915: add dynamic clock frequency control 2009-09-04 13:05:38 -07:00
intel_lvds.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel 2009-11-04 07:05:43 -08:00
intel_modes.c drm/i915: Change I2C api to pass around i2c_adapters 2009-06-18 15:53:57 -07:00
intel_sdvo_regs.h drm/i915: enable sdvo lvds scaling function. 2009-07-01 11:44:45 -07:00
intel_sdvo.c drm/i915: Add the missing clone_mask for SDVO-VGA(RGB1) 2009-09-10 11:30:54 -07:00
intel_tv.c drm/i915: Multiply the refresh by 1000 in TV mode validatiion 2009-10-02 12:12:31 -07:00
Makefile drm/intel: refactor DP i2c support and DP common header to drm helper 2009-12-08 09:24:23 +10:00