Linus Torvalds e15daf6cdf Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 ... * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (25 commits) drm/radeon/kms: Convert R520 to new init path and associated cleanup drm/radeon/kms: Convert RV515 to new init path and associated cleanup drm: fix radeon DRM warnings when !CONFIG_DEBUG_FS drm: fix drm_fb_helper warning when !CONFIG_MAGIC_SYSRQ drm/r600: fix memory leak introduced with 64k malloc avoidance fix. drm/kms: make fb helper work for all drivers. drm/radeon/r600: fix offset handling in CS parser drm/radeon/kms/r600: fix forcing pci mode on agp cards drm/radeon/kms: fix for the extra pages copying. drm/radeon/kms/r600: add support for vline relocs drm/radeon/kms: fix some bugs in vline reloc drm/radeon/kms/r600: clamp vram to aperture size drm/kms: protect against fb helper not being created. drm/r600: get values from the passed in IB not the copy. drm: create gitignore file for radeon drm/radeon/kms: remove unneeded master create/destroy functions. drm/kms: start adding command line interface using fb. fb: change rules for global rules match. drm/radeon/kms: don't require up to 64k allocations. (v2) drm/radeon/kms: enable dac load detection by default. ... Trivial conflicts in drivers/gpu/drm/radeon/radeon_asic.h due to adding '->vga_set_state' function pointers.		2009-09-30 08:03:00 -07: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
Kconfig	drm/kms/radeon: make kms default a runtime option	2009-09-08 11:15:59 +10:00
Makefile	drm/kms/radeon: make kms default a runtime option	2009-09-08 11:15:59 +10:00
ObjectID.h	drm/radeon: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +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: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +10:00
atom.h	drm/radeon: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +10:00
atombios.h	drm/radeon/kms: add initial radeon tv-out support.	2009-09-08 09:24:37 +10:00
atombios_crtc.c	drm/radeon/kms: reprogram format in set base.	2009-09-18 16:01:53 +10:00
avivod.h	drm/radeon/kms: Convert RV515 to new init path and associated cleanup	2009-09-29 11:15:54 +10:00
mkregtable.c	drm/radeon: cleanup mkregtable.c	2009-08-31 09:09:28 +10:00
r100.c	Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-09-30 08:03:00 -07:00
r100_track.h	drm/radeon/kms: don't require up to 64k allocations. (v2)	2009-09-25 13:08:18 +10:00
r100d.h	drm/radeon/kms: convert r4xx to new init path	2009-09-14 16:09:59 +10:00
r200.c	drm/radeon/kms: don't require up to 64k allocations. (v2)	2009-09-25 13:08:18 +10:00
r300.c	drm/radeon/kms: don't require up to 64k allocations. (v2)	2009-09-25 13:08:18 +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
r300d.h	drm/radeon/kms: convert r4xx to new init path	2009-09-14 16:09:59 +10:00
r420.c	drm/radeon/kms: r420 idle after programming GA_ENHANCE	2009-09-21 14:15:10 +10:00
r420d.h	drm/radeon/kms: convert r4xx to new init path	2009-09-14 16:09:59 +10:00
r500_reg.h	drm/radeon/kms/r600: add support for vline relocs	2009-09-26 07:49:00 +10:00
r520.c	drm/radeon/kms: Convert R520 to new init path and associated cleanup	2009-09-29 11:15:56 +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.c	Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-09-30 08:03:00 -07:00
r600_blit.c	drm/radeon/r600: set correct pitch for 4 byte copy	2009-09-23 10:21:06 +10:00
r600_blit_kms.c	drm/radeon/r600: set correct pitch for 4 byte copy	2009-09-23 10:21:06 +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_cp.c	drm/radeon/kms: add r600 KMS support	2009-09-08 11:15:52 +10:00
r600_cs.c	drm/radeon/kms: Convert RV515 to new init path and associated cleanup	2009-09-29 11:15:54 +10:00
r600_reg.h	drm/radeon: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +10:00
r600d.h	drm/vgaarb: add VGA arbitration support to the drm and kms.	2009-09-21 15:00:27 +10:00
radeon.h	Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-09-30 08:03:00 -07:00
radeon_agp.c	drm/radeon: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +10:00
radeon_asic.h	Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-09-30 08:03:00 -07:00
radeon_atombios.c	drm/radeon/kms: enable r600 tv outputs.	2009-09-25 13:08:17 +10:00
radeon_benchmark.c	drm/radeon: Fix size used for benchmarking BO copies.	2009-07-29 16:08:56 +10:00
radeon_bios.c	drm/radeon: introduce kernel modesetting for radeon hardware	2009-06-15 12:01:53 +10:00
radeon_clocks.c	drm/radeon/kms: add r600 KMS support	2009-09-08 11:15:52 +10:00
radeon_combios.c	drm/radeon/kms: add initial connector properties	2009-09-18 16:02:00 +10:00
radeon_connectors.c	drm/kms: make fb helper work for all drivers.	2009-09-28 15:31:10 +10:00
radeon_cp.c	drm/radeon: some r420s have a CP race with the DMA engine.	2009-09-21 14:48:45 +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: fix hotspot handling on pre-avivo chips	2009-07-15 17:13:24 +10:00
radeon_device.c	Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-09-30 08:03:00 -07:00
radeon_display.c	drm/radeon/kms: add initial connector properties	2009-09-18 16:02:00 +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: add initial connector properties	2009-09-18 16:02:00 +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/kms: start adding command line interface using fb.	2009-09-25 13:08:20 +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: clear confusion in GART init/deinit path	2009-09-15 08:53:14 +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.c	drm/radeon/r600: don't do interrupts	2009-09-18 14:34:06 +10:00
radeon_irq_kms.c	radeon: Use request_firmware()	2009-08-31 09:09:30 +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: reprogram format in set base.	2009-09-18 16:01:53 +10:00
radeon_legacy_encoders.c	drm/radeon/kms: add initial connector properties	2009-09-18 16:02:00 +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: add initial connector properties	2009-09-18 16:02:00 +10:00
radeon_object.c	drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.	2009-09-18 16:01:59 +10:00
radeon_object.h	ttm: Make parts of a struct ttm_bo_device global.	2009-08-19 16:10:34 +10:00
radeon_reg.h	drm/radeon/kms/r600: add support for vline relocs	2009-09-26 07:49:00 +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: Add radeon.test parameter for running BO GPU copy tests.	2009-07-29 16:08:39 +10:00
radeon_ttm.c	Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-09-30 08:03:00 -07:00
rs400.c	drm/radeon/kms: clear confusion in GART init/deinit path	2009-09-15 08:53:14 +10:00
rs600.c	drm/radeon/kms: Convert RV515 to new init path and associated cleanup	2009-09-29 11:15:54 +10:00
rs690.c	drm/radeon/kms: Convert RV515 to new init path and associated cleanup	2009-09-29 11:15:54 +10:00
rs690r.h	drm/radeon/kms: fix bandwidth computation on avivo hardware	2009-07-29 15:45:09 +10:00
rv515.c	drm/radeon/kms: Convert R520 to new init path and associated cleanup	2009-09-29 11:15:56 +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: Convert RV515 to new init path and associated cleanup	2009-09-29 11:15:54 +10:00
rv770d.h	drm/radeon/kms: add r600 KMS support	2009-09-08 11:15:52 +10:00