Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next

Browse source

It looks like you missed my last 3.18 pull from 9/24.  This one
includes those patches and a few more on top.  The additional patches are:
- Maarten's radeon fence updates
- Some additional debugging output
From the previous pull request:
- Re-enable some dpm features that were previously disabled due
  to a bug that was fixed in 3.16
- Make some arrays static
- re-arrange some audio code to properly reflect connected status
  in the audio driver

* 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/kv: add uvd/vce info to dpm debugfs output
  drm/radeon/ci: add uvd/vce info to dpm debugfs output
  drm/radeon: export reservation_object from dmabuf to ttm
  drm/radeon: cope with foreign fences inside the reservation object
  drm/radeon: cope with foreign fences inside display
  drm/radeon/cik: write gfx ucode version to ucode addr reg
  drm/radeon/si: print full CS when we hit a packet 0
  drm/radeon: remove unecessary includes
  drm/radeon/combios: declare legacy_connector_convert as static
  drm/radeon/atombios: declare connector convert tables as static
  drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
  drm/radeon/dpm: drop clk/voltage dependency filters for BTC
  drm/radeon/dpm: drop clk/voltage dependency filters for CI
  drm/radeon/dpm: drop clk/voltage dependency filters for SI
  drm/radeon/dpm: drop clk/voltage dependency filters for NI
  drm/radeon: disable audio when we disable hdmi (v2)
  drm/radeon: split audio enable between eg and r600 (v2)
  drm/radeon: consolidate r600_audio.c into r600_hdmi.c
  drm/radeon: consolidate duplicate encode is digital function
  drm/radeon: fix register name to match internal name

...

This commit is contained in:

Dave Airlie 2014-10-07 14:26:40 +10:00

parent 7a42e83d36 369283bfbd

commit ccb09a8e36

49 changed files with 408 additions and 452 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

2

drivers/gpu/drm/radeon/Makefile

View file

23

drivers/gpu/drm/radeon/atombios_encoders.c

View file

51

drivers/gpu/drm/radeon/btc_dpm.c

View file

2

drivers/gpu/drm/radeon/btc_dpm.h

View file

30

drivers/gpu/drm/radeon/ci_dpm.c

View file

23

drivers/gpu/drm/radeon/cik.c

View file

2

drivers/gpu/drm/radeon/cik_sdma.c

View file

4

drivers/gpu/drm/radeon/dce3_1_afmt.c

View file

6

drivers/gpu/drm/radeon/dce6_afmt.c

View file

7

drivers/gpu/drm/radeon/evergreen.c

View file

2

drivers/gpu/drm/radeon/evergreen_dma.c

View file

49

drivers/gpu/drm/radeon/evergreen_hdmi.c

View file

2

drivers/gpu/drm/radeon/kv_dpm.c

View file

24

drivers/gpu/drm/radeon/ni_dpm.c

View file

6

drivers/gpu/drm/radeon/r600.c

View file

207

drivers/gpu/drm/radeon/r600_audio.c

View file

2

drivers/gpu/drm/radeon/r600_dma.c

View file

172

drivers/gpu/drm/radeon/r600_hdmi.c

View file

17

drivers/gpu/drm/radeon/r600d.h

View file

13

drivers/gpu/drm/radeon/radeon.h

View file

1

drivers/gpu/drm/radeon/radeon_asic.h

View file

6

drivers/gpu/drm/radeon/radeon_atombios.c

View file

4

drivers/gpu/drm/radeon/radeon_benchmark.c

View file

2

drivers/gpu/drm/radeon/radeon_combios.c

View file

28

drivers/gpu/drm/radeon/radeon_cs.c

View file

2

drivers/gpu/drm/radeon/radeon_device.c

View file

30

drivers/gpu/drm/radeon/radeon_display.c

View file

21

drivers/gpu/drm/radeon/radeon_encoders.c

View file

9

drivers/gpu/drm/radeon/radeon_fence.c

View file

2

drivers/gpu/drm/radeon/radeon_gart.c

View file

2

drivers/gpu/drm/radeon/radeon_gem.c

View file

1

drivers/gpu/drm/radeon/radeon_mode.h

View file

8

drivers/gpu/drm/radeon/radeon_object.c

View file

1

drivers/gpu/drm/radeon/radeon_object.h

View file

5

drivers/gpu/drm/radeon/radeon_prime.c

View file

2

drivers/gpu/drm/radeon/radeon_ring.c

View file

2

drivers/gpu/drm/radeon/radeon_sa.c

View file

29

drivers/gpu/drm/radeon/radeon_semaphore.c

View file

5

drivers/gpu/drm/radeon/radeon_test.c

View file

2

drivers/gpu/drm/radeon/radeon_ttm.c

View file

3

drivers/gpu/drm/radeon/radeon_uvd.c

View file

3

drivers/gpu/drm/radeon/radeon_vce.c

View file

9

drivers/gpu/drm/radeon/radeon_vm.c

View file

1

drivers/gpu/drm/radeon/rv770.c

View file

2

drivers/gpu/drm/radeon/rv770_dma.c

View file

8

drivers/gpu/drm/radeon/si.c

View file

2

drivers/gpu/drm/radeon/si_dma.c

View file

24

drivers/gpu/drm/radeon/si_dpm.c

View file

2

drivers/gpu/drm/radeon/sid.h

View file