UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/gpu/drm/radeon
History
Daniel Vetter 767878908e Linux 3.4-rc3 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEbBAABAgAGBQJPi3XOAAoJEHm+PkMAQRiGnsUH9RjHwH4YFVyuP/DKtKa6zs74
 wqkpT15yITQ5WWMog4JaJFFg5rJCUd8QZr7AS/HSn0ijDyZX5VU7Rcs9cMudDzNR
 H/5K/AscS4fjb0HwWVqoltTWHRb9QGSwVN3+E3VCDLt9P89YJ0o3QztkkuEX5dkZ
 jc7reVXTfRnCcILEa9jleOzrn+OLM3j/jAjQ2hGunl8EDLzD4b17HHPoli4jEZ/5
 5ibpSVsPD+AqzN+glbXvYjVItl12D0IQos/JdOwfuZriCVWLxysSSwHZTbPCyvBZ
 LHH4HR5T+XLSXbjJeNkUFHLzqU+d5gVRadIoWtJCxqxFjKbOs2YtzJ5Ai0nDiw==
 =kTkC
 -----END PGP SIGNATURE-----

Merge tag 'v3.4-rc3' into drm-intel-next-queued

Backmerge Linux 3.4-rc3 into drm-intel-next to resolve a few things
that conflict/depend upon patches in -rc3:
- Second part of the Sandybridge workaround series - it changes some
  of the same registers.
- Preparation for Chris Wilson's fencing cleanup - we need the fix
  from -rc3 merged before we can move around all that code.
- Resolve the gmbus conflict - gmbus has been disabled in 3.4 again,
  but should be enabled on all generations in 3.5.

Conflicts:
	drivers/gpu/drm/i915/intel_i2c.c

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
 		2012-04-17 11:16:20 +02:00
..
reg_srcs drm/radeon/kms: add htile support to the cs checker v3 2012-03-26 09:53:22 +01:00
.gitignore
…
Kconfig drm/radeon/kms: clean up the radeon kms Kconfig 2011-05-26 09:22:05 +10:00
Makefile drm/radeon/kms: add support for CP setup on SI 2012-03-21 06:55:54 +00:00
ObjectID.h drm/radeon/kms: Upstream ObjectID.h updates 2012-03-21 06:55:49 +00:00
atom-bits.h
…
atom-names.h
…
atom-types.h
…
atom.c drm/radeon/kms: fix fans after resume 2012-04-02 11:07:42 +01:00
atom.h drm/radeon/kms: fix fans after resume 2012-04-02 11:07:42 +01:00
atombios.h drm/radeon/kms: upstream power table updates 2012-03-21 06:55:50 +00:00
atombios_crtc.c drm/radeon/kms/atom: force bpc to 8 for now 2012-03-26 09:53:12 +01:00
atombios_dp.c drm/radeon/kms/atom: force bpc to 8 for now 2012-03-26 09:53:12 +01:00
atombios_encoders.c drm/radeon/kms: fix DVO setup on some r4xx chips 2012-04-10 10:27:46 +01:00
atombios_i2c.c drm/radeon/kms/dce3+: add support for hw i2c using atom 2012-02-03 09:38:05 +00:00
avivod.h [rfc] drm/radeon/kms: pm debugging check for vbl. 2010-02-23 09:46:21 +10:00
cayman_blit_shaders.c bug.h: add include of it to various implicit C users 2012-02-29 17:15:08 -05:00
cayman_blit_shaders.h drm/radeon/kms: add blit support for cayman (v2) 2011-05-26 09:19:31 +10:00
evergreen.c drm/radeon/kms: Update evergreen functions for trinity 2012-03-21 06:55:57 +00:00
evergreen_blit_kms.c drm/radeon/kms: cayman gpu init updates for trinity 2012-03-21 06:55:57 +00:00
evergreen_blit_shaders.c bug.h: add include of it to various implicit C users 2012-02-29 17:15:08 -05: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/kms: add htile support to the cs checker v3 2012-03-26 09:53:22 +01:00
evergreen_reg.h drm/radeon/kms: add wait_for_vblank asic callback 2012-02-27 14:46:13 +00:00
evergreend.h drm/radeon/kms: add htile support to the cs checker v3 2012-03-26 09:53:22 +01:00
mkregtable.c radeon mkregtable: Add missing fclose() calls 2011-02-14 09:22:54 +10:00
ni.c drm/radeon/kms: add support for ucode loading on trinity (v2) 2012-03-21 06:55:57 +00:00
ni_reg.h drm/radeon/kms: add ni_reg.h 2011-01-07 14:11:38 +10:00
nid.h drm/radeon/kms: Update evergreen functions for trinity 2012-03-21 06:55:57 +00:00
r100.c Linux 3.4-rc3 2012-04-17 11:16:20 +02:00
r100_track.h drm/radeon: Remove more bogus inlines in the radeon driver. 2011-10-18 09:44:52 +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: add r1xx/r2xx CS support for tiled textures 2012-02-03 09:41:35 +00:00
r300.c drm: Merge tag 'v3.3-rc7' into drm-core-next 2012-03-15 10:24:32 +00: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
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: Merge tag 'v3.3-rc7' into drm-core-next 2012-03-15 10:24:32 +00:00
r420d.h
…
r500_reg.h drm/radeon/kms: add wait_for_vblank asic callback 2012-02-27 14:46:13 +00:00
r520.c drm: Merge tag 'v3.3-rc7' into drm-core-next 2012-03-15 10:24:32 +00:00
r520d.h
…
r600.c Linux 3.4-rc3 2012-04-17 11:16:20 +02:00
r600_audio.c drm/radeon/kms: support for audio on Evergreen 2011-12-19 18:40:26 +00:00
r600_blit.c drm/radeon: drop inlines in r600_blit.c 2011-10-18 09:44:38 +01:00
r600_blit_kms.c drm/radeon/kms: common definitions for blit copy code 2012-02-03 09:31:14 +00:00
r600_blit_shaders.c The following text was taken from the original review request: 2012-03-24 10:08:39 -07:00
r600_blit_shaders.h drm/radeon: add some missing copyright headers 2010-09-13 20:26:04 +10:00
r600_cp.c drm/radeon: replace udelay with mdelay for long timeouts 2012-04-10 10:21:00 +01:00
r600_cs.c drm/radeon/kms: add htile support to the cs checker v3 2012-03-26 09:53:22 +01:00
r600_hdmi.c drm/radeon/kms: define TMDS/LVTM HDMI enabling bits 2012-01-03 09:40:47 +00:00
r600_reg.h drm/radeon/kms: fix r6xx+ scanout on BE systems 2011-01-27 13:54:13 +10:00
r600d.h drm/radeon/kms: add htile support to the cs checker v3 2012-03-26 09:53:22 +01:00
radeon.h drm/radeon/kms: add trinity (TN) chip family 2012-03-21 06:55:55 +00:00
radeon_acpi.c drm/radeon/kms: Skip ACPI call to ATIF when possible 2011-12-01 09:57:34 +00: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: add radeon_asic struct for trinity 2012-03-21 06:55:58 +00:00
radeon_asic.h drm/radeon/kms: add radeon_asic struct for SI 2012-03-21 06:55:55 +00:00
radeon_atombios.c drm/radeon/kms: update power table parsing for SI 2012-03-21 06:55:52 +00:00
radeon_atpx_handler.c drm/radeon: fix use after free in ATRM bios reading code. 2012-02-02 15:25:16 +00:00
radeon_benchmark.c drm/radeon/kms: reorganize copy callbacks 2012-02-29 10:14:14 +00:00
radeon_bios.c drm/radeon: finish getting bios earlier 2012-01-24 17:34:32 +00:00
radeon_blit_common.h drm/radeon/kms: common definitions for blit copy code 2012-02-03 09:31:14 +00:00
radeon_clocks.c drm/radeon: replace udelay with mdelay for long timeouts 2012-04-10 10:21:00 +01:00
radeon_combios.c drm/radeon: replace udelay with mdelay for long timeouts 2012-04-10 10:21:00 +01:00
radeon_connectors.c drm/radeon/kms: update duallink checks for DCE6 2012-03-21 06:55:58 +00:00
radeon_cp.c drm: move pci bus master enable into driver. 2012-02-16 18:31:07 +00:00
radeon_cs.c drm/radeon/kms: attempt to avoid copying data twice on coherent cards. (v3) 2012-04-12 09:42:54 +01:00
radeon_cursor.c drm/radeon: Drop radeon_gem_object_(un)pin. 2012-03-20 08:47:50 +00:00
radeon_device.c drm/radeon: enable pci bus mastering after card is initialised (v2) 2012-04-12 09:27:47 +01:00
radeon_display.c drm/radeon/kms: DCE6 disp eng pll updates 2012-03-21 06:55:51 +00:00
radeon_drv.c drm/radeon/kms: add info query for max pipes 2012-03-21 06:55:49 +00:00
radeon_drv.h Fix common misspellings 2011-03-31 11:26:23 -03:00
radeon_encoders.c drm/radeon/kms: update duallink checks for DCE6 2012-03-21 06:55:58 +00:00
radeon_family.h drm/radeon/kms: add trinity (TN) chip family 2012-03-21 06:55:55 +00:00
radeon_fb.c drm/radeon: Restrict offset for legacy display engine. 2012-03-20 08:47:46 +00:00
radeon_fence.c drm/radeon/kms: drop lock in return path of radeon_fence_count_emitted. 2012-02-14 10:56:16 +00:00
radeon_gart.c drm/radeon/kms/vm: fix possible bug in radeon_vm_bo_rmv() 2012-02-29 17:47:57 +00:00
radeon_gem.c drm/radeon: Drop radeon_gem_object_(un)pin. 2012-03-20 08:47:50 +00:00
radeon_i2c.c drm/radeon: only add the mm i2c bus if the hw_i2c module param is set 2012-04-11 09:36:53 +01:00
radeon_ioc32.c
…
radeon_irq.c drm/radeon: Move more code out of line 2011-10-18 09:53:05 +01:00
radeon_irq_kms.c drm/radeon/kms: Add an MSI quirk for Dell RS690 2012-01-23 11:00:48 +00:00
radeon_kms.c drm/radeon: enable pci bus mastering after card is initialised (v2) 2012-04-12 09:27:47 +01:00
radeon_legacy_crtc.c drm/radeon: Restrict offset for legacy display engine. 2012-03-20 08:47:46 +00:00
radeon_legacy_encoders.c drm/radeon: replace udelay with mdelay for long timeouts 2012-04-10 10:21:00 +01: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: DCE6 disp eng pll updates 2012-03-21 06:55:51 +00:00
radeon_object.c drm/radeon: Don't dereference possibly-NULL pointer. 2012-04-02 11:09:50 +01:00
radeon_object.h drm/radeon: Restrict offset for legacy hardware cursor. 2012-03-20 08:47:41 +00:00
radeon_pm.c drm/radeon/kms: no support for internal thermal sensor on TN yet 2012-03-21 06:55:55 +00:00
radeon_reg.h drm/radeon/kms: fix up atom HPD gpio parsing for DCE6 2012-03-21 06:55:50 +00:00
radeon_ring.c drm/radeon/kms: add support for the CONST IB to the CS ioctl 2012-03-21 06:55:53 +00:00
radeon_sa.c drm/radeon: introduce a sub allocator and convert ib pool to it v4 2011-12-20 19:52:12 +00:00
radeon_semaphore.c drm/radeon: allocate semaphore from the ib pool 2012-01-05 10:03:53 +00: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/kms: add missing ring ready check in sync tests 2012-01-05 10:02:42 +00:00
radeon_trace.h drm/radeon: add initial tracepoint support. 2010-12-16 14:37:47 +10:00
radeon_trace_points.c drm/radeon: add initial tracepoint support. 2010-12-16 14:37:47 +10:00
radeon_ttm.c drm/radeon/kms: reorganize copy callbacks 2012-02-29 10:14:14 +00:00
rs100d.h
…
rs400.c drm: Merge tag 'v3.3-rc7' into drm-core-next 2012-03-15 10:24:32 +00:00
rs400d.h
…
rs600.c drm: Merge tag 'v3.3-rc7' into drm-core-next 2012-03-15 10:24:32 +00: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 drm: Merge tag 'v3.3-rc7' into drm-core-next 2012-03-15 10:24:32 +00: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-next' of git://people.freedesktop.org/~airlied/linux 2012-03-22 13:08:22 -07:00
rv515d.h drm/radeon/kms: simplify & improve GPU reset V2 2010-04-06 11:21:11 +10:00
rv770.c drm: Merge tag 'v3.3-rc7' into drm-core-next 2012-03-15 10:24:32 +00:00
rv770d.h drm/radeon/kms: 6xx/7xx big endian fixes 2011-02-14 09:23:38 +10:00
si.c drm/radeon: enable pci bus mastering after card is initialised (v2) 2012-04-12 09:27:47 +01:00
si_blit_shaders.c The following text was taken from the original review request: 2012-03-24 10:08:39 -07:00
si_blit_shaders.h drm/radeon/kms: add support for CP setup on SI 2012-03-21 06:55:54 +00:00
si_reg.h drm/radeon/kms: fix up atom HPD gpio parsing for DCE6 2012-03-21 06:55:50 +00:00
sid.h drm/radeon/kms: add support for interrupts on SI 2012-03-21 06:55:54 +00:00