Dave Airlie 3ff99164f6 Merge remote branch 'anholt/drm-intel-next' into drm-linus ... This merges the upstream Intel tree and fixes up numerous conflicts due to patches merged into Linus tree later in -rc cycle. Conflicts: drivers/char/agp/intel-agp.c drivers/gpu/drm/drm_dp_i2c_helper.c drivers/gpu/drm/i915/i915_irq.c drivers/gpu/drm/i915/i915_suspend.c		2009-12-08 14:03:47 +10:00
..
reg_srcs	drm/radeon/kms: add rn50/r100/r200 CS tracker.	2009-09-08 08:54:31 +10:00
.gitignore	drm: create gitignore file for radeon	2009-09-25 13:08:21 +10:00
atom-bits.h	drm/radeon: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +10:00
atom-names.h	drm/radeon: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +10:00
atom-types.h	drm/radeon: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +10:00
atom.c	drm/radeon/kms: read back register before writing in IIO.	2009-11-24 13:02:07 +10:00
atom.h	drm/radeon: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +10:00
atombios_crtc.c	drm/radeon/kms/atom: fix potential oops in spread spectrum code	2009-10-28 15:30:03 +10:00
atombios.h	drm/radeon/kms/atom: add support for spread spectrum (v2)	2009-10-26 13:28:22 +10:00
avivod.h	drm/radeon/kms: Convert RV515 to new init path and associated cleanup	2009-09-29 11:15:54 +10:00
Kconfig	drm/kms/radeon: make kms default a runtime option	2009-09-08 11:15:59 +10:00
Makefile	drm/radeon/kms: add debugfs for power management for AtomBIOS devices	2009-11-06 14:13:25 +10:00
mkregtable.c	drm: radeon: Mark several functions static in mkregtable	2009-11-15 15:01:40 -08:00
ObjectID.h	drm/radeon: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +10:00
r100_track.h	drm/radeon/kms: don't require up to 64k allocations. (v2)	2009-09-25 13:08:18 +10:00
r100.c	Merge branch 'drm-core-next' of ../linux-2.6 into drm-next	2009-11-18 10:09:55 +10:00
r100d.h	drm/radeon/kms: Convert R100 to new init path (V2)	2009-10-02 08:51:49 +10:00
r200.c	drm/radeon/kms: Convert R100 to new init path (V2)	2009-10-02 08:51:49 +10:00
r300_cmdbuf.c	drm/radeon: add regs required for occlusion queries support	2009-03-29 18:31:35 +10:00
r300_reg.h	drm/radeon/kms: add initial colortiling support.	2009-07-29 15:42:18 +10:00
r300.c	drm/radeon/kms: use RADEON_GPU_PAGE_SIZE instead of 4096	2009-10-16 08:49:23 +10:00
r300d.h	drm/radeon/kms: Convert R300 to new init path	2009-10-02 08:51:48 +10:00
r420.c	drm/radeon/kms: add debugfs for power management for AtomBIOS devices	2009-11-06 14:13:25 +10:00
r420d.h	drm/radeon/kms: Convert RS400/RS480 to new init path & fix legacy VGA (V3)	2009-10-02 08:51:46 +10:00
r500_reg.h	drm/radeon/kms/r7xx: add regs for 40 bit CUR/GRPH addresses	2009-10-26 13:28:22 +10:00
r520.c	drm/radeon/kms: add debugfs for power management for AtomBIOS devices	2009-11-06 14:13:25 +10:00
r520d.h	drm/radeon/kms: Convert R520 to new init path and associated cleanup	2009-09-29 11:15:56 +10:00
r600_blit_kms.c	drm/radeon/kms/r600: fix rs880 support v2	2009-11-06 11:35:18 +10:00
r600_blit_shaders.c	drm/radeon/kms: add r600 KMS support	2009-09-08 11:15:52 +10:00
r600_blit_shaders.h	drm/radeon/kms: add r600 KMS support	2009-09-08 11:15:52 +10:00
r600_blit.c	drm/radeon/r600: only assign vb after we know space is available.	2009-10-26 13:28:21 +10:00
r600_cp.c	drm/radeon/kms: add r600 KMS support	2009-09-08 11:15:52 +10:00
r600_cs.c	drm/radeon/r600: CS parser updates	2009-11-10 13:41:07 +10:00
r600_reg.h	drm/radeon: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +10:00
r600.c	Merge branch 'drm-core-next' of ../linux-2.6 into drm-next	2009-11-18 10:09:55 +10:00
r600d.h	Merge branch 'drm-core-next' of ../linux-2.6 into drm-next	2009-11-18 10:09:55 +10:00
radeon_agp.c	drm/radeon/kms: resume AGP by calling init.	2009-11-24 13:01:47 +10:00
radeon_asic.h	Merge branch 'drm-core-next' of ../linux-2.6 into drm-next	2009-11-18 10:09:55 +10:00
radeon_atombios.c	drm/radeon/kms: add debugfs for power management for AtomBIOS devices	2009-11-06 14:13:25 +10:00
radeon_benchmark.c	drm/radeon/kms: use RADEON_GPU_PAGE_SIZE instead of 4096	2009-10-16 08:49:23 +10:00
radeon_bios.c	drm/radeon/kms: remove some misleading debugging output	2009-11-04 13:38:02 +10:00
radeon_clocks.c	drm/radeon/kms: add debugfs for power management for AtomBIOS devices	2009-11-06 14:13:25 +10:00
radeon_combios.c	drm/radeon/kms: store detailed connector info	2009-11-06 11:35:30 +10:00
radeon_connectors.c	drm/radeon/kms: Report vga connector is connected according to ddc_probe	2009-11-24 13:02:25 +10:00
radeon_cp.c	drm/radeon: A bit of cleanup work on radeon_freelist_get()	2009-10-26 13:29:26 +10:00
radeon_cs.c	drm/radeon/kms: fix for the extra pages copying.	2009-09-26 09:03:39 +10:00
radeon_cursor.c	drm/radeon/kms/r7xx: add regs for 40 bit CUR/GRPH addresses	2009-10-26 13:28:22 +10:00
radeon_device.c	drm/radeon/kms: resume AGP by calling init.	2009-11-24 13:01:47 +10:00
radeon_display.c	drm/radeon/kms: fix connector edid handling	2009-10-16 08:46:52 +10:00
radeon_drv.c	drm/radeon/kms: remove unneeded master create/destroy functions.	2009-09-25 13:08:20 +10:00
radeon_drv.h	drm/radeon: consolidate family flags used in pciids.	2009-09-23 10:21:00 +10:00
radeon_encoders.c	drm/radeon/kms/atom/dce3: call transmitter init on mode set	2009-11-06 11:35:36 +10:00
radeon_family.h	drm/radeon: consolidate family flags used in pciids.	2009-09-23 10:21:00 +10:00
radeon_fb.c	drm/fb: add more correct 8/16/24/32 bpp fb support.	2009-10-06 13:54:01 +10:00
radeon_fence.c	drm/radeon/r600: use fence->timeout directly	2009-09-09 08:17:57 +10:00
radeon_fixed.h	drm/radeon: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +10:00
radeon_gart.c	drm/radeon/kms: use RADEON_GPU_PAGE_SIZE instead of 4096	2009-10-16 08:49:23 +10:00
radeon_gem.c	drm/radeon/kms: Fix radeon_gem_busy_ioctl harder.	2009-08-23 11:36:13 +10:00
radeon_i2c.c	drm: Remove memory debugging infrastructure.	2009-06-18 13:00:33 -07:00
radeon_ioc32.c	drm/radeon/kms: add 32/64 ioctl support.	2009-09-15 09:03:43 +10:00
radeon_irq_kms.c	drm/radeon/kms: add support for msi	2009-10-26 13:28:23 +10:00
radeon_irq.c	drm/radeon/r600: don't do interrupts	2009-09-18 14:34:06 +10:00
radeon_kms.c	drm/radeon/kms: remove unneeded master create/destroy functions.	2009-09-25 13:08:20 +10:00
radeon_legacy_crtc.c	drm/radeon/kms: fix internal tmds setup on legacy display engine	2009-10-15 15:33:46 +10:00
radeon_legacy_encoders.c	drm/radeon/kms: fix internal tmds setup on legacy display engine	2009-10-15 15:33:46 +10:00
radeon_legacy_tv.c	drm/radeon/kms: add initial radeon tv-out support.	2009-09-08 09:24:37 +10:00
radeon_mem.c	drm: Remove memory debugging infrastructure.	2009-06-18 13:00:33 -07:00
radeon_mode.h	drm/radeon/kms: store detailed connector info	2009-11-06 11:35:30 +10:00
radeon_object.c	drm/radeon: use list_for_each_entry instead of list_for_each	2009-10-08 09:40:05 +10:00
radeon_object.h	ttm: Make parts of a struct ttm_bo_device global.	2009-08-19 16:10:34 +10:00
radeon_pm.c	drm/radeon/kms: add debugfs for power management for AtomBIOS devices	2009-11-06 14:13:25 +10:00
radeon_reg.h	drm/radeon/kms: add support for msi	2009-10-26 13:28:23 +10:00
radeon_ring.c	drm/radeon/kms: IB locking dumps out a lockdep ordering issue	2009-09-16 09:15:39 +10:00
radeon_state.c	drm/radeon/r600: don't do interrupts	2009-09-18 14:34:06 +10:00
radeon_test.c	drm/radeon/kms: use RADEON_GPU_PAGE_SIZE instead of 4096	2009-10-16 08:49:23 +10:00
radeon_ttm.c	Merge branch 'drm-core-next' of ../linux-2.6 into drm-next	2009-11-18 10:09:55 +10:00
radeon.h	drm/radeon/kms: resume AGP by calling init.	2009-11-24 13:01:47 +10:00
rs100d.h	drm/radeon/kms: Convert R100 to new init path (V2)	2009-10-02 08:51:49 +10:00
rs400.c	drm/radeon/kms: fix rc410 suspend/resume.	2009-10-28 16:01:58 +10:00
rs400d.h	drm/radeon/kms: Convert RS400/RS480 to new init path & fix legacy VGA (V3)	2009-10-02 08:51:46 +10:00
rs600.c	drm/radeon/kms: add debugfs for power management for AtomBIOS devices	2009-11-06 14:13:25 +10:00
rs600d.h	drm/radeon/kms: Fix RS600/RV515/R520/RS690 IRQ	2009-10-08 09:40:04 +10:00
rs690.c	drm/radeon/kms: add debugfs for power management for AtomBIOS devices	2009-11-06 14:13:25 +10:00
rs690d.h	drm/radeon/kms: Convert RS690/RS740 to new init path (V2).	2009-10-02 08:51:50 +10:00
rv200d.h	drm/radeon/kms: Convert R100 to new init path (V2)	2009-10-02 08:51:49 +10:00
rv250d.h	drm/radeon/kms: Convert R100 to new init path (V2)	2009-10-02 08:51:49 +10:00
rv350d.h	drm/radeon/kms: Convert RS400/RS480 to new init path & fix legacy VGA (V3)	2009-10-02 08:51:46 +10:00
rv515.c	drm/radeon/kms: fix handling of d1/d2 vga	2009-11-24 13:02:01 +10:00
rv515d.h	drm/radeon/kms: Convert RV515 to new init path and associated cleanup	2009-09-29 11:15:54 +10:00
rv770.c	drm/radeon/kms: add debugfs for power management for AtomBIOS devices	2009-11-06 14:13:25 +10:00
rv770d.h	drm/radeon/kms: fix vram_width calculation on r6xx/r7xx	2009-10-26 13:28:19 +10:00