Eric Anholt 34dc4d4423 Merge remote branch 'origin/master' into drm-intel-next ... Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/radeon/r300.c The BSD ringbuffer support that is landing in this branch significantly conflicts with the Ironlake PIPE_CONTROL fix on master, and requires it to be tested successfully anyway.		2010-05-10 13:36:52 -07:00
..
reg_srcs	drm/radeon/kms: allow R500 regs VAP_ALT_NUM_VERTICES and VAP_INDEX_OFFSET	2010-04-19 14:17:02 +10:00
.gitignore
atom-bits.h
atom-names.h
atom-types.h
atom.c	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-04-19 07:27:06 -07:00
atom.h	drm/radeon/kms/atom: make sure tables are valid (v2)	2010-03-31 13:11:29 +10:00
atombios.h	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
atombios_crtc.c	Merge branch 'drm-radeon-evergreen-accel' into drm-core-next	2010-04-20 13:16:50 +10:00
atombios_dp.c	drm/radeon/kms/dp: disable training pattern on the sink at the end of link training	2010-03-31 13:14:08 +10:00
avivod.h
evergreen.c	Merge branch 'drm-ttm-unmappable' into drm-core-next	2010-04-20 14:15:09 +10:00
evergreen_reg.h
evergreend.h	drm/radeon/kms/evergreen: implement irq support	2010-04-09 10:16:09 +10:00
Kconfig
Makefile	drm/radeon: create radeon_asic.c	2010-03-15 11:27:03 +10:00
mkregtable.c
ObjectID.h
r100.c	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
r100_track.h	drm/radeon/kms: r300 fix CS checker to allow zbuffer-only fastfill	2010-04-28 17:20:41 +10:00
r100d.h	drm/radeon/kms: simplify & improve GPU reset V2	2010-04-06 11:21:11 +10:00
r200.c	drm/radeon: include radeon_asic.h in the asic specific files	2010-03-15 11:27:22 +10:00
r300.c	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
r300_cmdbuf.c	drm/radeon: Fix sparc regression in r300_scratch()	2010-04-27 09:40:57 +10:00
r300_reg.h
r300d.h	drm/radeon/kms: simplify & improve GPU reset V2	2010-04-06 11:21:11 +10:00
r420.c	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
r420d.h
r500_reg.h
r520.c	drm/radeon/kms: simplify & improve GPU reset V2	2010-04-06 11:21:11 +10:00
r520d.h
r600.c	drm/radeon/kms: HDMI irq support	2010-04-23 14:12:17 +10:00
r600_audio.c	drm/radeon/kms: HDMI irq support	2010-04-23 14:12:17 +10:00
r600_blit.c	drm/radeon: use ALIGN instead of open coding it	2010-03-01 15:56:41 +10:00
r600_blit_kms.c	drm/radeon/kms: simplify & improve GPU reset V2	2010-04-06 11:21:11 +10:00
r600_blit_shaders.c	drm/radeon/r600: add missing license and comments to r600_blit_shaders.c	2010-03-15 10:07:38 +10:00
r600_blit_shaders.h
r600_cp.c	drm/radeon/kms: gfx init fixes for r6xx/r7xx	2010-03-31 09:53:53 +10:00
r600_cs.c	drm/radeon/r6xx/r7xx: CS parser fixes	2010-03-31 13:12:17 +10:00
r600_hdmi.c	drm/radeon/kms: HDMI irq support	2010-04-23 14:12:17 +10:00
r600_reg.h	drm/radeon/kms: HDMI irq support	2010-04-23 14:12:17 +10:00
r600d.h	drm/radeon/r6xx/r7xx: CS parser fixes	2010-03-31 13:12:17 +10:00
radeon.h	drm/radeon/kms: HDMI irq support	2010-04-23 14:12:17 +10:00
radeon_agp.c	drm/radeon/kms/agp The wrong AGP chipset can cause a NULL pointer dereference	2010-04-28 17:22:50 +10:00
radeon_asic.c	drm/radeon/kms/evergreen: implement irq support	2010-04-09 10:16:09 +10:00
radeon_asic.h	drm/radeon/kms/evergreen: implement irq support	2010-04-09 10:16:09 +10:00
radeon_atombios.c	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
radeon_atpx_handler.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
radeon_benchmark.c
radeon_bios.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
radeon_clocks.c
radeon_combios.c	Merge branch 'drm-edid-fixes' into drm-core-next	2010-04-20 13:14:38 +10:00
radeon_connectors.c	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
radeon_cp.c	drm/radeon: 9800 SE has only one quadpipe	2010-04-23 13:54:59 +10:00
radeon_cs.c	drm/radeon/kms: simplify & improve GPU reset V2	2010-04-06 11:21:11 +10:00
radeon_cursor.c	Merge remote branch 'korg/drm-radeon-testing' into drm-next-stage	2010-02-26 16:23:23 +10:00
radeon_device.c	Merge branch 'drm-fbdev-cleanup' into drm-core-next	2010-04-20 13:16:04 +10:00
radeon_display.c	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
radeon_drv.c	drm/radeon/kms: allow R500 regs VAP_ALT_NUM_VERTICES and VAP_INDEX_OFFSET	2010-04-19 14:17:02 +10:00
radeon_drv.h	drm/radeon: bump the UMS driver version for r6xx/r7xx const buffer support	2010-03-31 13:12:28 +10:00
radeon_encoders.c	drm/radeon/kms: fix panel scaling adjusted mode setup	2010-05-05 11:27:59 +10:00
radeon_family.h	drm/radeon/kms: print GPU family and device id when loading	2010-04-19 11:25:24 +10:00
radeon_fb.c	Merge branch 'drm-fbdev-cleanup' into drm-core-next	2010-04-20 13:16:04 +10:00
radeon_fence.c	drm/radeon/kms: R3XX-R4XX fix GPU reset code	2010-04-27 09:48:16 +10:00
radeon_fixed.h
radeon_gart.c	drm/radeon/kms: simplify & improve GPU reset V2	2010-04-06 11:21:11 +10:00
radeon_gem.c	drm: free core gem object from driver callbacks	2010-04-20 13:19:33 +10:00
radeon_i2c.c	drm/radeon/kms: add hw_i2c module option	2010-03-31 14:55:52 +10:00
radeon_ioc32.c
radeon_irq.c
radeon_irq_kms.c	drm/kms/fb: add polling support for when nothing is connected.	2010-04-07 10:29:52 +10:00
radeon_kms.c	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-04-27 08:22:50 -07:00
radeon_legacy_crtc.c	drm/radeon/kms/rs4xx: make sure crtcs are enabled when setting timing	2010-03-15 09:59:24 +10:00
radeon_legacy_encoders.c	drm/radeon/kms: fix panel scaling adjusted mode setup	2010-05-05 11:27:59 +10:00
radeon_legacy_tv.c	drm/radeon/kms: fix pal tv-out support on legacy IGP chips	2010-03-15 09:57:42 +10:00
radeon_mem.c
radeon_mode.h	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
radeon_object.c	Merge branch 'drm-ttm-unmappable' into drm-core-next	2010-04-20 14:15:09 +10:00
radeon_object.h	drm/radeon/kms: add support for new fault callback V7	2010-04-20 14:12:22 +10:00
radeon_pm.c	drm/radeon/kms/pm: fix segfault in clock code	2010-03-31 09:53:46 +10:00
radeon_reg.h	drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus.	2010-04-01 12:50:46 +10:00
radeon_ring.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
radeon_state.c	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
radeon_test.c
radeon_ttm.c	Merge branch 'drm-ttm-unmappable' into drm-core-next	2010-04-20 14:15:09 +10:00
rs100d.h
rs400.c	Merge branch 'drm-radeon-lockup' into drm-core-next	2010-04-20 13:15:05 +10:00
rs400d.h
rs600.c	Merge branch 'drm-radeon-lockup' into drm-core-next	2010-04-20 13:15:05 +10:00
rs600d.h	drm/radeon/kms: simplify & improve GPU reset V2	2010-04-06 11:21:11 +10:00
rs690.c	drm/radeon/kms: simplify & improve GPU reset V2	2010-04-06 11:21:11 +10:00
rs690d.h	drm/radeon/kms: display watermark updates (v2)	2010-03-31 14:54:47 +10:00
rv200d.h
rv250d.h
rv350d.h
rv515.c	Merge branch 'drm-radeon-lockup' into drm-core-next	2010-04-20 13:15:05 +10:00
rv515d.h	drm/radeon/kms: simplify & improve GPU reset V2	2010-04-06 11:21:11 +10:00
rv770.c	Merge branch 'drm-ttm-unmappable' into drm-core-next	2010-04-20 14:15:09 +10:00
rv770d.h