Merge branch 'topic/dp-aux-rework' into drm-intel-next-queued

Browse source

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

A bit a mess with reverts which differe in details between -fixes and
-next and some other unrelated shuffling.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

...

This commit is contained in:

Daniel Vetter 2014-03-19 15:54:37 +01:00

parent 262ca2b08f 0b99836f23

commit b80d6c781e

252 changed files with 7837 additions and 4231 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

502

Documentation/DocBook/drm.tmpl

View file

27

Documentation/devicetree/bindings/drm/i2c/tda998x.txt

View file

2

Documentation/networking/packet_mmap.txt

View file

48

Documentation/networking/timestamping.txt

View file

3

MAINTAINERS

View file

2

Makefile

View file

2

arch/cris/include/asm/bitops.h

View file

2

arch/ia64/kernel/uncached.c

View file

3

arch/powerpc/platforms/cell/ras.c

View file

4

arch/x86/Kconfig.cpu

View file

8

arch/x86/include/asm/barrier.h

View file

2

arch/x86/include/asm/io.h

View file

5

arch/x86/include/asm/spinlock.h

View file

272

arch/x86/kernel/cpu/centaur.c

View file

3

arch/x86/kernel/cpu/perf_event_intel_uncore.c

View file

15

arch/x86/kernel/i387.c

View file

2

arch/x86/kernel/quirks.c

View file

6

arch/x86/kvm/svm.c

View file

2

arch/x86/net/bpf_jit.S

View file

4

arch/x86/um/asm/barrier.h

View file

32

drivers/acpi/sleep.c

View file

3

drivers/ata/libata-core.c

View file

4

drivers/cpufreq/cpufreq.c

View file

5

drivers/gpu/drm/ast/ast_ttm.c

View file

6

drivers/gpu/drm/bochs/bochs_mm.c

View file

5

drivers/gpu/drm/cirrus/cirrus_ttm.c

View file

714

drivers/gpu/drm/drm_crtc.c

View file

193

drivers/gpu/drm/drm_crtc_helper.c

View file

38

drivers/gpu/drm/drm_crtc_internal.h

View file

396

drivers/gpu/drm/drm_dp_helper.c

View file

4

drivers/gpu/drm/drm_drv.c

View file

34

drivers/gpu/drm/drm_edid.c

View file

17

drivers/gpu/drm/drm_fb_helper.c

View file

95

drivers/gpu/drm/drm_fops.c

View file

71

drivers/gpu/drm/drm_gem.c

View file

19

drivers/gpu/drm/drm_gem_cma_helper.c

View file

211

drivers/gpu/drm/drm_mm.c

View file

346

drivers/gpu/drm/drm_modes.c

View file

4

drivers/gpu/drm/drm_pci.c

View file

2

drivers/gpu/drm/drm_platform.c

View file

110

drivers/gpu/drm/drm_prime.c

View file

436

drivers/gpu/drm/drm_stub.c

View file

2

drivers/gpu/drm/drm_usb.c

View file

602

drivers/gpu/drm/i2c/tda998x_drv.c

View file

3

drivers/gpu/drm/i915/i915_gem.c

View file

513

drivers/gpu/drm/i915/intel_dp.c

View file

3

drivers/gpu/drm/i915/intel_drv.h

View file

5

drivers/gpu/drm/mgag200/mgag200_ttm.c

View file

2

drivers/gpu/drm/nouveau/nouveau_gem.c

View file

4

drivers/gpu/drm/nouveau/nouveau_ttm.c

View file

34

drivers/gpu/drm/omapdrm/omap_gem.c

View file

2

drivers/gpu/drm/qxl/qxl_object.c

View file

6

drivers/gpu/drm/qxl/qxl_ttm.c

View file

8

drivers/gpu/drm/radeon/Makefile

View file

4

drivers/gpu/drm/radeon/btc_dpm.c

View file

67

drivers/gpu/drm/radeon/ci_dpm.c

View file

114

drivers/gpu/drm/radeon/cik.c

View file

20

drivers/gpu/drm/radeon/cik_sdma.c

View file

49

drivers/gpu/drm/radeon/cikd.h

View file

4

drivers/gpu/drm/radeon/cypress_dpm.c

View file

6

drivers/gpu/drm/radeon/evergreen.c

View file

210

drivers/gpu/drm/radeon/evergreen_cs.c

View file

4

drivers/gpu/drm/radeon/evergreen_dma.c

View file

64

drivers/gpu/drm/radeon/kv_dpm.c

View file

8

drivers/gpu/drm/radeon/ni.c

View file

6

drivers/gpu/drm/radeon/ni_dma.c

View file

7

drivers/gpu/drm/radeon/ni_dpm.c

View file

45

drivers/gpu/drm/radeon/r100.c

View file

20

drivers/gpu/drm/radeon/r200.c

View file

32

drivers/gpu/drm/radeon/r300.c

View file

6

drivers/gpu/drm/radeon/r600.c

View file

110

drivers/gpu/drm/radeon/r600_cs.c

View file

6

drivers/gpu/drm/radeon/r600_dma.c

View file

48

drivers/gpu/drm/radeon/r600_dpm.c

View file

2

drivers/gpu/drm/radeon/r600_dpm.h

View file

158

drivers/gpu/drm/radeon/radeon.h

View file

19

drivers/gpu/drm/radeon/radeon_asic.c

View file

14

drivers/gpu/drm/radeon/radeon_asic.h

View file

163

drivers/gpu/drm/radeon/radeon_cs.c

View file

8

drivers/gpu/drm/radeon/radeon_device.c

View file

3

drivers/gpu/drm/radeon/radeon_drv.c

View file

59

drivers/gpu/drm/radeon/radeon_fence.c

View file

958

drivers/gpu/drm/radeon/radeon_gart.c

View file

49

drivers/gpu/drm/radeon/radeon_gem.c

View file

44

drivers/gpu/drm/radeon/radeon_kms.c

View file

136

drivers/gpu/drm/radeon/radeon_object.c

View file

9

drivers/gpu/drm/radeon/radeon_object.h

View file

32

drivers/gpu/drm/radeon/radeon_pm.c

View file

118

drivers/gpu/drm/radeon/radeon_ring.c

View file

7

drivers/gpu/drm/radeon/radeon_sa.c

View file

14

drivers/gpu/drm/radeon/radeon_semaphore.c

View file

39

drivers/gpu/drm/radeon/radeon_test.c

View file

13

drivers/gpu/drm/radeon/radeon_ttm.c

View file

5

drivers/gpu/drm/radeon/radeon_uvd.c

View file

699

drivers/gpu/drm/radeon/radeon_vce.c

View file

966

drivers/gpu/drm/radeon/radeon_vm.c

View file

7

drivers/gpu/drm/radeon/rs780_dpm.c

View file

7

drivers/gpu/drm/radeon/rv6xx_dpm.c

View file

7

drivers/gpu/drm/radeon/rv770_dpm.c

View file

10

drivers/gpu/drm/radeon/si.c

View file

Some files were not shown because too many files have changed in this diff Show more