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

Browse source

- Additional Hawaii fixes
- Support for using the display scaler on non-fixed mode displays
- Support for new firmware format that makes it easier to update
- Enable dpm by default on additional asics
- GPUVM improvements
- Support for uncached and write combined gtt buffers
- Allow allocation of BOs larger than visible vram
- Various other small fixes and improvements

* 'drm-next-3.17' of git://people.freedesktop.org/~agd5f/linux: (57 commits)
  drm/radeon: Prevent hdmi deep color if max_tmds_clock is undefined.
  drm/radeon: Use pflip irqs for pageflip completion if possible. (v2)
  drm/radeon: tweak ACCEL_WORKING2 query for the new firmware for hawaii
  drm/radeon: use packet3 for nop on hawaii with new firmware
  drm/radeon: tweak ACCEL_WORKING2 query for hawaii
  drm/radeon: use packet2 for nop on hawaii with old firmware
  drm/radeon: update IB size estimation for VM
  drm/radeon: split PT setup in more functions
  drm/radeon: add VM GART copy optimization to NI as well
  drm/radeon: take a BO reference on VM cleanup
  drm/radeon: add radeon_bo_ref function
  drm/radeon: remove taking mclk_lock from radeon_bo_unref
  drm/radeon: adjust default radeon_vm_block_size v2
  drm/radeon: try to enable VM flushing once more
  drm/radeon: use an intervall tree to manage the VMA v2
  drm/radeon: remove radeon_bo_clear_va
  drm/radeon: invalidate moved BOs in the VM (v2)
  drm/radeon: re-enable dpm by default on BTC
  drm/radeon: re-enable dpm by default on cayman
  drm/radeon: Only flush HDP cache from idle ioctl if BO is in VRAM
  ...

...

This commit is contained in:

Dave Airlie 2014-08-06 08:18:21 +10:00

parent 168c02ec06 9f51e2e04f

commit f7257a224e

56 changed files with 3057 additions and 1430 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

1

drivers/gpu/drm/Kconfig

View file

2

drivers/gpu/drm/radeon/Makefile

View file

16

drivers/gpu/drm/radeon/atombios_encoders.c

View file

13

drivers/gpu/drm/radeon/ci_dpm.c

View file

39

drivers/gpu/drm/radeon/ci_smc.c

View file

720

drivers/gpu/drm/radeon/cik.c

View file

249

drivers/gpu/drm/radeon/cik_sdma.c

View file

16

drivers/gpu/drm/radeon/dce6_afmt.c

View file

18

drivers/gpu/drm/radeon/evergreen.c

View file

4

drivers/gpu/drm/radeon/evergreen_hdmi.c

View file

1

drivers/gpu/drm/radeon/ni.c

View file

176

drivers/gpu/drm/radeon/ni_dma.c

View file

56

drivers/gpu/drm/radeon/r100.c

View file

13

drivers/gpu/drm/radeon/r300.c

View file

24

drivers/gpu/drm/radeon/r600.c

View file

127

drivers/gpu/drm/radeon/radeon.h

View file

79

drivers/gpu/drm/radeon/radeon_asic.c

View file

77

drivers/gpu/drm/radeon/radeon_asic.h

View file

83

drivers/gpu/drm/radeon/radeon_atombios.c

View file

4

drivers/gpu/drm/radeon/radeon_benchmark.c

View file

316

drivers/gpu/drm/radeon/radeon_connectors.c

View file

3

drivers/gpu/drm/radeon/radeon_cs.c

View file

87

drivers/gpu/drm/radeon/radeon_device.c

View file

72

drivers/gpu/drm/radeon/radeon_display.c

View file

14

drivers/gpu/drm/radeon/radeon_drv.c

View file

4

drivers/gpu/drm/radeon/radeon_encoders.c

View file

3

drivers/gpu/drm/radeon/radeon_fb.c

View file

38

drivers/gpu/drm/radeon/radeon_gart.c

View file

58

drivers/gpu/drm/radeon/radeon_gem.c

View file

319

drivers/gpu/drm/radeon/radeon_ib.c

View file

13

drivers/gpu/drm/radeon/radeon_kms.c

View file

4

drivers/gpu/drm/radeon/radeon_mode.h

View file

63

drivers/gpu/drm/radeon/radeon_object.c

View file

6

drivers/gpu/drm/radeon/radeon_object.h

View file

16

drivers/gpu/drm/radeon/radeon_pm.c

View file

2

drivers/gpu/drm/radeon/radeon_prime.c

View file

287

drivers/gpu/drm/radeon/radeon_ring.c

View file

4

drivers/gpu/drm/radeon/radeon_sa.c

View file

12

drivers/gpu/drm/radeon/radeon_test.c

View file

22

drivers/gpu/drm/radeon/radeon_trace.h

View file

10

drivers/gpu/drm/radeon/radeon_ttm.c

View file

167

drivers/gpu/drm/radeon/radeon_ucode.c

View file

71

drivers/gpu/drm/radeon/radeon_ucode.h

View file

6

drivers/gpu/drm/radeon/radeon_uvd.c

View file

2

drivers/gpu/drm/radeon/radeon_vce.c

View file

278

drivers/gpu/drm/radeon/radeon_vm.c

View file

14

drivers/gpu/drm/radeon/rs400.c

View file

17

drivers/gpu/drm/radeon/rs600.c

View file

1

drivers/gpu/drm/radeon/rv770.c

View file

480

drivers/gpu/drm/radeon/si.c

View file

178

drivers/gpu/drm/radeon/si_dma.c

View file

150

drivers/gpu/drm/radeon/si_dpm.c

View file

5

drivers/gpu/drm/radeon/si_dpm.h

View file

62

drivers/gpu/drm/radeon/si_smc.c

View file

3

drivers/gpu/drm/radeon/sislands_smc.h

View file

4

include/uapi/drm/radeon_drm.h

View file