linux/drivers/gpu/drm/radeon
Eric Anholt 2bd34f6ca8 Merge remote branch 'origin/master' into drm-intel-next
This resolves the conflict in the EDP code, which has been rather
popular to hack on recently.

Conflicts:
	drivers/gpu/drm/i915/intel_dp.c
2010-08-01 19:34:47 -07:00
..
reg_srcs drm/radeon/kms: fix typos in evergreen command checker 2010-07-01 11:59:38 +10:00
.gitignore drm: create gitignore file for radeon 2009-09-25 13:08:21 +10:00
atom-bits.h
atom-names.h
atom-types.h
atom.c drm/radeon/kms: add ioport register access 2010-08-02 10:00:07 +10:00
atom.h drm/radeon/kms: add ioport register access 2010-08-02 10:00:07 +10:00
atombios_crtc.c drm/radeon/kms: Add crtc tiling setup support for evergreen 2010-08-02 10:00:02 +10:00
atombios_dp.c drm/radeon/kms: hpd cleanup 2010-05-19 10:31:41 +10:00
atombios.h Merge branch 'drm-for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 2010-05-21 11:14:52 -07:00
avivod.h [rfc] drm/radeon/kms: pm debugging check for vbl. 2010-02-23 09:46:21 +10:00
evergreen_cs.c drm/radeon/kms: drop taking lock around crtc lookup. 2010-07-22 09:57:13 +10:00
evergreen_reg.h drm/radeon/kms: Add crtc tiling setup support for evergreen 2010-08-02 10:00:02 +10:00
evergreen.c drm/radeon/kms/r6xx+: add query for tile config (v2) 2010-08-02 10:00:05 +10:00
evergreend.h drm/radeon/kms: add support for internal thermal sensors (v3) 2010-08-02 10:00:00 +10:00
Kconfig drm/radeon: fix power supply kconfig interaction. 2010-05-21 15:41:20 +10:00
Makefile drm/radeon: Add support for the ATIF ACPI method to the radeon driver 2010-08-02 09:59:59 +10:00
mkregtable.c drm/radeon: mkregtable.c: close a file before exit 2010-01-08 13:11:55 +10:00
ObjectID.h drm/radeon/kms: pull in the latest upstream ObjectID.h changes 2010-01-08 13:03:57 +10:00
r100_track.h drm/radeon/kms: r300 fix CS checker to allow zbuffer-only fastfill 2010-04-28 17:20:41 +10:00
r100.c Merge tag 'v2.6.35-rc6' into drm-radeon-next 2010-08-02 10:05:24 +10:00
r100d.h drm/radeon/kms/pm: add additional asic callbacks 2010-05-18 18:21:12 +10:00
r200.c drm/radeon/r200: handle more hw tex coord types 2010-07-01 11:59:22 +10:00
r300_cmdbuf.c drm/radeon: Fix sparc regression in r300_scratch() 2010-04-27 09:40:57 +10:00
r300_reg.h drm/radeon/kms: add support for square microtiles on r3xx-r5xx 2010-02-25 11:36:12 +10:00
r300.c Merge tag 'v2.6.35-rc6' into drm-radeon-next 2010-08-02 10:05:24 +10:00
r300d.h drm/radeon/kms: simplify & improve GPU reset V2 2010-04-06 11:21:11 +10:00
r420.c drm/radeon/kms: check/restore sanity before doing anything else with GPU. 2010-08-02 10:00:09 +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: Add crtc tiling setup support for r6xx/r7xx 2010-08-02 10:00:01 +10:00
r520.c Merge tag 'v2.6.35-rc6' into drm-radeon-next 2010-08-02 10:05:24 +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_audio.c drm/radeon/kms: trivial code style fixes for audio 2010-08-02 10:17:10 +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: remove viewport transform from r6xx/r7xx blit emit 2010-08-02 10:07:48 +10:00
r600_blit_shaders.h
r600_blit.c drm/r600: fix possible NULL pointer derefernce 2010-07-21 10:29:32 +10:00
r600_cp.c drm/radeon/kms: gfx init fixes for r6xx/r7xx 2010-03-31 09:53:53 +10:00
r600_cs.c Merge tag 'v2.6.35-rc6' into drm-radeon-next 2010-08-02 10:05:24 +10:00
r600_hdmi.c drm/radeon/kms: enable HDMI audio on RS600/RS690/RS740 2010-08-02 10:00:06 +10:00
r600_reg.h drm/radeon/kms: HDMI irq support 2010-04-23 14:12:17 +10:00
r600.c drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush 2010-08-02 10:06:18 +10:00
r600d.h drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush 2010-08-02 10:06:18 +10:00
radeon_acpi.c drm/radeon: Add support for the ATIF ACPI method to the radeon driver 2010-08-02 09:59:59 +10:00
radeon_agp.c drm/radeon/kms: release AGP bridge at suspend 2010-05-24 10:02:08 +10:00
radeon_asic.c drm/radeon/kms: avoid oops on mac r4xx cards 2010-07-01 11:59:36 +10:00
radeon_asic.h drm/radeon/kms: check/restore sanity before doing anything else with GPU. 2010-08-02 10:00:09 +10:00
radeon_atombios.c Merge tag 'v2.6.35-rc6' into drm-radeon-next 2010-08-02 10:05:24 +10: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 drm/radeon: Skip dma copy test in benchmark if card doesn't have dma engine. 2010-02-11 13:13:25 +10:00
radeon_bios.c Merge branch 'drm-platform' into drm-testing 2010-07-07 18:37:35 +10:00
radeon_clocks.c drm/radeon/kms: add initial Evergreen support (Radeon HD 5xxx) 2010-02-09 09:44:02 +10:00
radeon_combios.c Merge tag 'v2.6.35-rc6' into drm-radeon-next 2010-08-02 10:05:24 +10:00
radeon_connectors.c drm/radeon/kms: fix shared ddc harder 2010-07-21 08:37:25 +10:00
radeon_cp.c drm: Remove drm_resource wrappers 2010-06-01 10:07:24 +10:00
radeon_cs.c drm/radeon/kms: simplify & improve GPU reset V2 2010-04-06 11:21:11 +10:00
radeon_cursor.c drm/radeon/kms: return ret in cursor_set failure path 2010-07-01 11:59:27 +10:00
radeon_device.c Merge tag 'v2.6.35-rc6' into drm-radeon-next 2010-08-02 10:05:24 +10:00
radeon_display.c drm: radeon: fix sign bug 2010-08-02 10:00:10 +10:00
radeon_drv.c drm/radeon/kms/r6xx+: add query for tile config (v2) 2010-08-02 10:00:05 +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 DP after DPMS cycle 2010-07-01 11:59:14 +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 drm: Propagate error from drm_fb_helper_init(). 2010-06-08 09:32:02 +10:00
radeon_fence.c drm/radeon/kms: R3XX-R4XX fix GPU reset code 2010-04-27 09:48:16 +10:00
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 drm: convert drm_ioctl to unlocked_ioctl 2009-12-18 11:22:31 +10:00
radeon_irq_kms.c drm/radeon/kms: add support for gui idle interrupts (v4) 2010-05-18 18:20:49 +10:00
radeon_irq.c gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test 2010-01-07 13:56:32 +10:00
radeon_kms.c Merge tag 'v2.6.35-rc6' into drm-radeon-next 2010-08-02 10:05:24 +10:00
radeon_legacy_crtc.c drm/radeon/kms/pm: add support for no display power states 2010-05-18 18:21:50 +10:00
radeon_legacy_encoders.c drm/radeon/kms: fix legacy LVDS dpms sequence 2010-07-22 10:01:40 +10:00
radeon_legacy_tv.c drm/radeon/kms: fix legacy tv-out pal mode 2010-07-13 11:02:49 +10:00
radeon_mem.c
radeon_mode.h drm/radeon: add fake RN50 table for powerpc 2010-07-01 11:59:19 +10:00
radeon_object.c drm/radeon: fall back to GTT if bo creation/validation in VRAM fails. 2010-08-02 10:00:08 +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 Merge remote branch 'origin/master' into drm-intel-next 2010-08-01 19:34:47 -07:00
radeon_reg.h drm/radeon/kms/pm: add asic specific callbacks for setting power state (v2) 2010-05-18 18:20:57 +10:00
radeon_ring.c drm/radeon/kms: fix lock ordering in ring, ib handling 2010-05-18 18:21:48 +10:00
radeon_state.c Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 2010-05-28 16:14:40 -07:00
radeon_test.c drm/radeon/kms: simplify memory controller setup V2 2010-02-18 14:49:35 +10:00
radeon_ttm.c drm/radeon: AGP memory is only I/O if the aperture can be mapped by the CPU. 2010-05-21 15:06:45 +10:00
radeon.h Merge tag 'v2.6.35-rc6' into drm-radeon-next 2010-08-02 10:05:24 +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: remove rs4xx gart limit 2010-08-02 10:06:01 +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 Merge tag 'v2.6.35-rc6' into drm-radeon-next 2010-08-02 10:05:24 +10:00
rs600d.h drm/radeon/kms: enable misc pm power state features on r5xx, rs6xx 2010-05-18 18:21:42 +10:00
rs690.c Merge tag 'v2.6.35-rc6' into drm-radeon-next 2010-08-02 10:05:24 +10:00
rs690d.h drm/radeon/kms: display watermark updates (v2) 2010-03-31 14:54:47 +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 Merge tag 'v2.6.35-rc6' into drm-radeon-next 2010-08-02 10:05:24 +10:00
rv515d.h drm/radeon/kms: simplify & improve GPU reset V2 2010-04-06 11:21:11 +10:00
rv770.c drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush 2010-08-02 10:06:18 +10:00
rv770d.h drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush 2010-08-02 10:06:18 +10:00