public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linux/drivers/gpu/drm/radeon
History
Dave Airlie e8115e79aa Linux 3.18-rc7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUe7l9AAoJEHm+PkMAQRiGkGcIAIryQ7NKn4IaxUtS807Lx4Ih
 obEnx7nNKZTXCZpD/7XQGHMMJyozMJR50PHZESJoHu4Luhv9h7EFRnyJ6MdqMlwn
 zla3zY0yRsHwPoJKcHbSE0CPHZz0WPQHj7IEbM+XJz2tMNJfbgTrezElmcCM4DRp
 c9ae+ggwZ2cyNYM0r2RSwSJ525WMh69f9dzSUE27fpvkllQgwqNs/jHYz8HNOEht
 FWcv5UhvzKjwJS3awULfOB3zH2QdFvVTrwAzd+kbV2Q6T6CaUoFRlhXeKUO6W2Jv
 pJM6oj8tMZUkdXEv7EQXT1kwEqC4DULTTTHs4tSF79O1ESmNfePiOwwBcwoM2nM=
 =kG1Y
 -----END PGP SIGNATURE-----

Merge tag 'v3.18-rc7' into drm-next

This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/tegra/dc.c
2014-12-02 10:58:33 +10:00
..
reg_srcs
.gitignore
atom-bits.h
atom-names.h
atom-types.h
atom.c drm/radeon: add locking around atombios scratch space usage 2014-11-11 17:22:26 -05:00
atom.h drm/radeon: add locking around atombios scratch space usage 2014-11-11 17:22:26 -05:00
atombios.h
atombios_crtc.c
atombios_dp.c drm/radeon: add locking around atombios scratch space usage 2014-11-11 17:22:26 -05:00
atombios_encoders.c drm/radeon: consolidate duplicate encode is digital function 2014-10-01 09:00:02 -04:00
atombios_i2c.c drm/radeon: add locking around atombios scratch space usage 2014-11-11 17:22:26 -05:00
avivod.h
btc_dpm.c drm/radeon: reduce sparse false positive warnings 2014-10-16 18:34:10 -04:00
btc_dpm.h Revert "drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table" 2014-10-13 11:34:13 -04:00
btcd.h
cayman_blit_shaders.c
cayman_blit_shaders.h
ci_dpm.c drm/radeon/ci: disable needless sclk changes 2014-11-20 13:00:13 -05:00
ci_dpm.h drm/radeon/dpm: add thermal dpm support for CI 2014-11-20 13:00:10 -05:00
ci_smc.c
cik.c Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
cik_blit_shaders.c
cik_blit_shaders.h
cik_reg.h
cik_sdma.c Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
cikd.h drm/radeon/dpm: add smc fan control for CI (v2) 2014-11-20 13:00:10 -05:00
clearstate_cayman.h
clearstate_ci.h
clearstate_defs.h
clearstate_evergreen.h
clearstate_si.h
cypress_dpm.c drm/radeon: reduce sparse false positive warnings 2014-10-16 18:34:10 -04:00
cypress_dpm.h
dce3_1_afmt.c drm/radeon: fix speaker allocation setup 2014-10-16 18:34:07 -04:00
dce6_afmt.c drm/radeon: fix speaker allocation setup 2014-10-16 18:34:07 -04:00
drm_buffer.c drm/radeon: move drm_buffer to drm/radeon/ 2014-09-10 17:11:21 +10:00
drm_buffer.h drm/radeon: move drm_buffer to drm/radeon/ 2014-09-10 17:11:21 +10:00
evergreen.c drm/radeon: add missing crtc unlock when setting up the MC 2014-11-06 17:41:19 -05:00
evergreen_blit_shaders.c
evergreen_blit_shaders.h
evergreen_cs.c
evergreen_dma.c drm/radeon: split semaphore and sync object handling v2 2014-11-20 13:00:16 -05:00
evergreen_hdmi.c drm/radeon: fix speaker allocation setup 2014-10-16 18:34:07 -04:00
evergreen_reg.h
evergreen_smc.h
evergreend.h
Kconfig
kv_dpm.c drm/radeon: dpm fixes for asrock systems 2014-10-28 10:44:35 -04:00
kv_dpm.h
kv_smc.c
Makefile drm/radeon: split semaphore and sync object handling v2 2014-11-20 13:00:16 -05:00
mkregtable.c
ni.c drm/radeon: use one VMID for each ring 2014-11-20 13:00:18 -05:00
ni_dma.c drm/radeon: use one VMID for each ring 2014-11-20 13:00:18 -05:00
ni_dpm.c drm/radeon: reduce sparse false positive warnings 2014-10-16 18:34:10 -04:00
ni_dpm.h
ni_reg.h
nid.h
nislands_smc.h
ObjectID.h
ppsmc.h drm/radeon/dpm: add thermal dpm support for CI 2014-11-20 13:00:10 -05:00
pptable.h drm/radeon/dpm: add smc fan control for CI (v2) 2014-11-20 13:00:10 -05:00
r100.c drm/radeon: make sure mode init is complete in bandwidth_update 2014-11-06 15:42:44 -05:00
r100_track.h
r100d.h
r200.c drm/radeon: add the infrastructure for concurrent buffer access 2014-09-11 10:46:01 -04:00
r300.c
r300_cmdbuf.c drm/radeon: move drm_buffer to drm/radeon/ 2014-09-10 17:11:21 +10:00
r300_reg.h
r300d.h
r420.c
r420d.h
r500_reg.h
r520.c
r520d.h
r600.c drm/radeon: split semaphore and sync object handling v2 2014-11-20 13:00:16 -05:00
r600_blit.c
r600_blit_shaders.c
r600_blit_shaders.h
r600_cp.c drm: Move drm_memory.c map support declarations to <drm/drm_legacy.h> 2014-09-12 15:28:12 +02:00
r600_cs.c
r600_dma.c Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
r600_dpm.c Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
r600_dpm.h drm/radeon/dpm: add smc fan control for SI (v2) 2014-11-20 13:00:09 -05:00
r600_hdmi.c drm/radeon: disable audio when we disable hdmi (v2) 2014-10-01 09:00:04 -04:00
r600_reg.h
r600d.h Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2014-10-14 09:39:08 +02:00
radeon.h drm/radeon: fence BO_VAs manually 2014-11-20 13:00:18 -05:00
radeon_acpi.c
radeon_acpi.h
radeon_agp.c
radeon_asic.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2014-10-14 09:39:08 +02:00
radeon_asic.h drm/radeon: rework vm_flush parameters 2014-11-20 13:00:14 -05:00
radeon_atombios.c drm/radeon/atombios: declare connector convert tables as static 2014-10-01 09:00:07 -04:00
radeon_atpx_handler.c ACPIPHP / radeon / nouveau: Remove acpi_bus_no_hotplug() 2014-09-15 13:15:34 -06:00
radeon_benchmark.c drm/radeon: export reservation_object from dmabuf to ttm 2014-10-03 09:19:17 -04:00
radeon_bios.c radeon: clean up coding style differences in radeon_get_bios() 2014-10-28 10:44:34 -04:00
radeon_clocks.c
radeon_combios.c drm/radeon/combios: declare legacy_connector_convert as static 2014-10-01 09:00:08 -04:00
radeon_connectors.c drm/radeon: report disconnected for LVDS/eDP with PX if ddc fails 2014-11-26 20:56:37 -05:00
radeon_cp.c drm: Move drm_memory.c map support declarations to <drm/drm_legacy.h> 2014-09-12 15:28:12 +02:00
radeon_cs.c drm/radeon: fence BO_VAs manually 2014-11-20 13:00:18 -05:00
radeon_cursor.c drm/radeon: Move radeon_cursor_move(_locked) to replace forward declaration 2014-11-20 11:11:42 -05:00
radeon_device.c Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
radeon_display.c drm/radeon: Use cursor_set2 hook for enabling / disabling the HW cursor 2014-11-20 11:11:41 -05:00
radeon_drv.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2014-10-14 09:39:08 +02:00
radeon_drv.h drm: Create drm legacy driver header 2014-09-12 11:08:55 +02:00
radeon_encoders.c drm/radeon: disable native backlight control on pre-r6xx asics (v2) 2014-11-20 11:12:55 -05:00
radeon_family.h
radeon_fb.c drm/radeon: use container_of to resolve radeon_fbdev from drm_fb_helper 2014-09-24 12:09:25 +02:00
radeon_fence.c drm/radeon: track VM update fences separately 2014-11-20 13:00:17 -05:00
radeon_gart.c drm/radeon: export reservation_object from dmabuf to ttm 2014-10-03 09:19:17 -04:00
radeon_gem.c Merge branch 'drm-next-3.19' of git://people.freedesktop.org/~agd5f/linux into drm-next 2014-11-21 12:17:43 +10:00
radeon_i2c.c
radeon_ib.c drm/radeon: track VM update fences separately 2014-11-20 13:00:17 -05:00
radeon_ioc32.c
radeon_irq.c
radeon_irq_kms.c gpu/radeon: Set flag to indicate broken 64-bit MSI 2014-11-24 14:12:56 +11:00
radeon_kfd.c
radeon_kfd.h
radeon_kms.c drm/radeon: stop re-reserving the BO in radeon_vm_bo_set_addr 2014-11-20 13:00:15 -05:00
radeon_legacy_crtc.c
radeon_legacy_encoders.c
radeon_legacy_tv.c
radeon_mem.c
radeon_mn.c drm/ttm: flip the switch, and convert to dma_fence 2014-09-02 16:41:50 +02:00
radeon_mode.h drm/radeon: Use cursor_set2 hook for enabling / disabling the HW cursor 2014-11-20 11:11:41 -05:00
radeon_object.c Merge branch 'drm-next-3.19' of git://people.freedesktop.org/~agd5f/linux into drm-next 2014-11-21 12:17:43 +10:00
radeon_object.h drm/radeon: fence PT updates manually v2 2014-11-20 13:00:16 -05:00
radeon_pm.c Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework 2014-09-11 14:46:53 +02:00
radeon_prime.c drm/radeon: export reservation_object from dmabuf to ttm 2014-10-03 09:19:17 -04:00
radeon_reg.h
radeon_ring.c drm/radeon: Use drm_malloc_ab instead of kmalloc_array 2014-10-28 10:44:34 -04:00
radeon_sa.c drm/radeon: export reservation_object from dmabuf to ttm 2014-10-03 09:19:17 -04:00
radeon_semaphore.c drm/radeon: split semaphore and sync object handling v2 2014-11-20 13:00:16 -05:00
radeon_state.c drm/radeon: move drm_buffer to drm/radeon/ 2014-09-10 17:11:21 +10:00
radeon_sync.c drm/radeon: track VM update fences separately 2014-11-20 13:00:17 -05:00
radeon_test.c drm/radeon: export reservation_object from dmabuf to ttm 2014-10-03 09:19:17 -04:00
radeon_trace.h
radeon_trace_points.c
radeon_ttm.c drm/radeon: export reservation_object from dmabuf to ttm 2014-10-03 09:19:17 -04:00
radeon_ucode.c
radeon_ucode.h
radeon_uvd.c drm/radeon: export reservation_object from dmabuf to ttm 2014-10-03 09:19:17 -04:00
radeon_vce.c drm/radeon: export reservation_object from dmabuf to ttm 2014-10-03 09:19:17 -04:00
radeon_vm.c drm/radeon: sync PT updates as shared v2 2014-11-20 13:00:19 -05:00
rs100d.h
rs400.c drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page 2014-09-18 21:52:29 -04:00
rs400d.h
rs600.c drm/radeon: make sure mode init is complete in bandwidth_update 2014-11-06 15:42:44 -05:00
rs600d.h
rs690.c drm/radeon: make sure mode init is complete in bandwidth_update 2014-11-06 15:42:44 -05:00
rs690d.h
rs780_dpm.c drm/radeon: reduce sparse false positive warnings 2014-10-16 18:34:10 -04:00
rs780_dpm.h
rs780d.h
rv6xx_dpm.c drm/radeon: reduce sparse false positive warnings 2014-10-16 18:34:10 -04:00
rv6xx_dpm.h
rv6xxd.h
rv200d.h
rv250d.h
rv350d.h
rv515.c drm/radeon: make sure mode init is complete in bandwidth_update 2014-11-06 15:42:44 -05:00
rv515d.h
rv730_dpm.c
rv730d.h
rv740_dpm.c
rv740d.h
rv770.c drm/radeon: remove unecessary includes 2014-10-01 09:00:09 -04:00
rv770_dma.c drm/radeon: split semaphore and sync object handling v2 2014-11-20 13:00:16 -05:00
rv770_dpm.c drm/radeon: reduce sparse false positive warnings 2014-10-16 18:34:10 -04:00
rv770_dpm.h
rv770_smc.c
rv770_smc.h
rv770d.h
si.c Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
si_blit_shaders.c
si_blit_shaders.h
si_dma.c drm/radeon: split semaphore and sync object handling v2 2014-11-20 13:00:16 -05:00
si_dpm.c drm/radeon/dpm: add smc fan control for SI (v2) 2014-11-20 13:00:09 -05:00
si_dpm.h drm/radeon/dpm: add smc fan control for SI (v2) 2014-11-20 13:00:09 -05:00
si_reg.h
si_smc.c
sid.h drm/radeon/dpm: add smc fan control for SI (v2) 2014-11-20 13:00:09 -05:00
sislands_smc.h drm/radeon/dpm: add smc fan control for SI (v2) 2014-11-20 13:00:09 -05:00
smu7.h
smu7_discrete.h drm/radeon/dpm: add smc fan control for CI (v2) 2014-11-20 13:00:10 -05:00
smu7_fusion.h
sumo_dpm.c drm/radeon: reduce sparse false positive warnings 2014-10-16 18:34:10 -04:00
sumo_dpm.h
sumo_smc.c
sumod.h
trinity_dpm.c drm/radeon: reduce sparse false positive warnings 2014-10-16 18:34:10 -04:00
trinity_dpm.h
trinity_smc.c
trinityd.h
uvd_v1_0.c
uvd_v2_2.c
uvd_v3_1.c
uvd_v4_2.c
vce_v1_0.c
vce_v2_0.c