leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
017ed8012e
linux/drivers/gpu/drm/radeon
History
Dave Airlie 017ed8012e Merge tag 'v3.1-rc10' into drm-core-next 
There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.

Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/radeon/evergreen.c
	drivers/gpu/drm/radeon/r600.c
	drivers/gpu/drm/radeon/radeon_asic.h
2011-10-18 10:54:30 +01:00
..
reg_srcs drm/radeon/kms: add initial CS checker support for compute 2011-06-21 12:36:39 +10:00
.gitignore
atom-bits.h
atom-names.h
atom-types.h
atom.c drm/radeon: fix potential NULL dereference in drivers/gpu/drm/radeon/atom.c 2011-08-04 14:39:06 +01:00
atom.h drm/radeon/kms: add ioport register access 2010-08-02 10:00:07 +10:00
atombios_crtc.c drm/radeon: ATOM Endian fix for atombios_crtc_program_pll() 2011-07-25 12:27:05 +01:00
atombios_dp.c drm/radeon/kms: retry aux transactions if there are status flags 2011-10-05 10:30:50 +01:00
atombios.h drm/radeon/kms: add missing external encoder action 2011-06-17 09:28:01 +10:00
avivod.h [rfc] drm/radeon/kms: pm debugging check for vbl. 2010-02-23 09:46:21 +10:00
cayman_blit_shaders.c drm/radeon/kms: add blit support for cayman (v2) 2011-05-26 09:19:31 +10:00
cayman_blit_shaders.h drm/radeon/kms: add blit support for cayman (v2) 2011-05-26 09:19:31 +10:00
evergreen_blit_kms.c drm/radeon/kms: blit code commoning 2011-10-18 10:10:52 +01:00
evergreen_blit_shaders.c drm/radeon/kms: evergreen/ni big endian fixes (v2) 2011-02-14 10:10:09 +10:00
evergreen_blit_shaders.h drm/radeon/kms: add drm blit support for evergreen 2010-10-06 11:46:30 +10:00
evergreen_cs.c drm/radeon: Remove now unused functions in radeon driver 2011-10-18 09:44:45 +01:00
evergreen_reg.h drm/radeon/kms: add pageflip ioctl support (v3) 2010-11-22 11:51:08 +10:00
evergreen.c Merge tag 'v3.1-rc10' into drm-core-next 2011-10-18 10:54:30 +01:00
evergreend.h drm/radeon/kms: demystify evergreen blit code 2011-10-18 10:06:23 +01:00
Kconfig drm/radeon/kms: clean up the radeon kms Kconfig 2011-05-26 09:22:05 +10:00
Makefile drm/radeon: clean reg header files 2011-08-04 14:39:04 +01:00
mkregtable.c radeon mkregtable: Add missing fclose() calls 2011-02-14 09:22:54 +10:00
ni_reg.h drm/radeon/kms: add ni_reg.h 2011-01-07 14:11:38 +10:00
ni.c Merge tag 'v3.1-rc10' into drm-core-next 2011-10-18 10:54:30 +01:00
nid.h drm/radeon/kms: fix typo in cayman reg offset 2011-07-02 07:09:19 +10:00
ObjectID.h drm/radeon/kms: upstream ObjectID.h updates 2010-11-23 09:23:14 +10:00
r100_track.h drm/radeon: Remove more bogus inlines in the radeon driver. 2011-10-18 09:44:52 +01:00
r100.c Merge tag 'v3.1-rc10' into drm-core-next 2011-10-18 10:54:30 +01:00
r100d.h drm/radeon: Definition of R_0003C2_GENMO_WT seems wrong 2010-12-21 12:55:33 +10:00
r200.c drm/radeon/kms: Make GPU/CPU page size handling consistent in blit code (v2) 2011-09-18 19:44:36 +01:00
r300_cmdbuf.c drm/radeon: Move more code out of line 2011-10-18 09:53:05 +01:00
r300_reg.h Fix common misspellings 2011-03-31 11:26:23 -03:00
r300.c drm/radeon: Print gart initialization details on all chipsets 2011-09-06 11:55:08 +01:00
r300d.h drm/radeon/kms: manage r300 CMASK RAM access and allow CMASK clear 2011-01-06 13:00:45 +10:00
r420.c drm: Fix printk typo 'failled' 2011-02-17 16:52:46 +01:00
r420d.h
r500_reg.h drm/radeon/kms: add pageflip ioctl support (v3) 2010-11-22 11:51:08 +10:00
r520.c drm: Fix printk typo 'failled' 2011-02-17 16:52:46 +01:00
r520d.h
r600_audio.c radeon: consolidate asic-specific function decls for r600 & later 2011-02-23 10:35:20 +10:00
r600_blit_kms.c drm/radeon/kms: rename a variable for consistency 2011-10-18 10:06:34 +01:00
r600_blit_shaders.c drm/radeon/kms: 6xx/7xx big endian fixes 2011-02-14 09:23:38 +10:00
r600_blit_shaders.h drm/radeon: add some missing copyright headers 2010-09-13 20:26:04 +10:00
r600_blit.c drm/radeon: drop inlines in r600_blit.c 2011-10-18 09:44:38 +01:00
r600_cp.c drm/radeon: Writeback endian fixes 2011-07-25 12:14:56 +01:00
r600_cs.c drm/radeon: Remove now unused functions in radeon driver 2011-10-18 09:44:45 +01:00
r600_hdmi.c Fix common misspellings 2011-03-31 11:26:23 -03:00
r600_reg.h drm/radeon/kms: fix r6xx+ scanout on BE systems 2011-01-27 13:54:13 +10:00
r600.c Merge tag 'v3.1-rc10' into drm-core-next 2011-10-18 10:54:30 +01:00
r600d.h drm/radeon/kms: demystify r600 blit code 2011-10-18 10:06:23 +01:00
radeon_acpi.c drm/radeon: tone down overchatty acpi debug messages. 2010-08-04 11:16:56 +10:00
radeon_agp.c drm/radeon/kms: fix agp mode setup on cards that use pcie bridges 2010-08-20 08:48:55 +10:00
radeon_asic.c drm/radeon/kms: blit code commoning 2011-10-18 10:10:52 +01:00
radeon_asic.h Merge tag 'v3.1-rc10' into drm-core-next 2011-10-18 10:54:30 +01:00
radeon_atombios.c drm/radeon: Move more code out of line 2011-10-18 09:53:05 +01:00
radeon_atpx_handler.c drm/radeon/kms: ATPX switcheroo fixes 2011-05-09 09:14:35 +10:00
radeon_benchmark.c drm/radeon/kms: add more elaborate benchmarks 2011-10-18 10:06:23 +01:00
radeon_bios.c drm/radeon/kms: fix typo in read_disabled vbios code 2011-07-12 06:58:59 +01:00
radeon_clocks.c drm/radeon/kms: set a default max_pixel_clock 2011-08-31 14:06:19 +01:00
radeon_combios.c drm/radeon/kms: Fix I2C mask definitions 2011-10-10 09:03:10 +01:00
radeon_connectors.c Merge tag 'v3.1-rc10' into drm-core-next 2011-10-18 10:54:30 +01:00
radeon_cp.c DRM: remove drm_pci_device_is_pcie 2011-07-13 08:14:52 +01:00
radeon_cs.c drm/radeon/kms: add a new gem_wait ioctl with read/write flags 2011-08-31 19:25:48 +01:00
radeon_cursor.c drm/radeon: Set cursor x/y to 0 when x/yorigin > 0. 2011-10-03 18:37:37 +01:00
radeon_device.c drm/radeon/kms: add more elaborate benchmarks 2011-10-18 10:06:23 +01:00
radeon_display.c drm/radeon: Unreference GEM object outside of spinlock in page flip error path. 2011-09-14 13:36:39 +01:00
radeon_drv.c drm/radeon/kms: add a new gem_wait ioctl with read/write flags 2011-08-31 19:25:48 +01:00
radeon_drv.h Fix common misspellings 2011-03-31 11:26:23 -03:00
radeon_encoders.c drm/radeon/kms: use hardcoded dig encoder to transmitter mapping for DCE4.1 2011-10-06 11:45:30 +01:00
radeon_family.h drm/radeon/kms: add family ids for llano APUs 2011-06-02 10:47:37 +10:00
radeon_fb.c Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next 2011-03-14 14:15:13 +10:00
radeon_fence.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
radeon_gart.c drm/radeon: Print gart initialization details on all chipsets 2011-09-06 11:55:08 +01:00
radeon_gem.c drm/radeon/kms: add a new gem_wait ioctl with read/write flags 2011-08-31 19:25:48 +01:00
radeon_i2c.c drm/radeon/kms: Simplify I2C post_xfer function 2011-10-18 10:03:15 +01:00
radeon_ioc32.c
radeon_irq_kms.c drm/radeon/kms: Initialize pageflip spinlocks. 2011-01-24 11:01:26 +10:00
radeon_irq.c drm/radeon: Move more code out of line 2011-10-18 09:53:05 +01:00
radeon_kms.c drm/radeon/kms: add a new gem_wait ioctl with read/write flags 2011-08-31 19:25:48 +01:00
radeon_legacy_crtc.c drivers:video:aty:radeon_base Fix typo occationally to occasionally 2011-03-22 16:31:59 +09:00
radeon_legacy_encoders.c drm/radeon: Fix KMS legacy backlight support if CONFIG_BACKLIGHT_CLASS_DEVICE=m. 2011-04-09 16:20:36 +10:00
radeon_legacy_tv.c drm/radeon: Move more code out of line 2011-10-18 09:53:05 +01:00
radeon_mem.c drivers: use kzalloc/kcalloc instead of 'kmalloc+memset', where possible 2011-07-25 20:57:13 -07:00
radeon_mode.h drm/radeon/kms: handle !force case in connector detect more gracefully 2011-10-10 09:04:26 +01:00
radeon_object.c drm/radeon: Move more code out of line 2011-10-18 09:53:05 +01:00
radeon_object.h drm/radeon: Move more code out of line 2011-10-18 09:53:05 +01:00
radeon_pm.c drm/radeon/kms: add missing vddci setting on NI+ 2011-07-26 12:30:34 +01:00
radeon_reg.h Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 2011-07-26 09:21:09 -07:00
radeon_ring.c drm/radeon: Move more code out of line 2011-10-18 09:53:05 +01:00
radeon_state.c drm/radeon: Move more code out of line 2011-10-18 09:53:05 +01:00
radeon_test.c drm/radeon: Explicitly print GTT/VRAM offsets on test failure. 2011-08-22 09:54:52 +01:00
radeon_trace_points.c drm/radeon: add initial tracepoint support. 2010-12-16 14:37:47 +10:00
radeon_trace.h drm/radeon: add initial tracepoint support. 2010-12-16 14:37:47 +10:00
radeon_ttm.c drm/radeon/kms: Make GPU/CPU page size handling consistent in blit code (v2) 2011-09-18 19:44:36 +01:00
radeon.h Merge tag 'v3.1-rc10' into drm-core-next 2011-10-18 10:54:30 +01:00
rs100d.h
rs400.c drm/radeon: Print gart initialization details on all chipsets 2011-09-06 11:55:08 +01:00
rs400d.h
rs600.c drm/radeon: Print gart initialization details on all chipsets 2011-09-06 11:55:08 +01: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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-03-18 10:37:40 -07: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 drm: Fix printk typo 'failled' 2011-02-17 16:52:46 +01:00
rv515d.h drm/radeon/kms: simplify & improve GPU reset V2 2010-04-06 11:21:11 +10:00
rv770.c Merge tag 'v3.1-rc10' into drm-core-next 2011-10-18 10:54:30 +01:00
rv770d.h drm/radeon/kms: 6xx/7xx big endian fixes 2011-02-14 09:23:38 +10:00