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

Browse source

- fix missing crtc unlock in MC setup
- set optimal CE ram config
- use gart rather than vram for DMA IB tests to avoid coherency issues with HDP
- fix a crasher with laptop mode and TDP scripts

* 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: add missing crtc unlock when setting up the MC
  drm/radeon: use gart for DMA IB tests
  drm/radeon: make sure mode init is complete in bandwidth_update
  drm/radeon: set correct CE ram size for CIK

...

This commit is contained in:

Dave Airlie 2014-11-07 10:46:00 +10:00

parent ed78bb846e f0d7bfb940

commit 2730fa0d8d

9 changed files with 46 additions and 21 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

7

drivers/gpu/drm/radeon/cik.c

View file

21

drivers/gpu/drm/radeon/cik_sdma.c

View file

4

drivers/gpu/drm/radeon/evergreen.c

View file

3

drivers/gpu/drm/radeon/r100.c

View file

20

drivers/gpu/drm/radeon/r600_dma.c

View file

3

drivers/gpu/drm/radeon/rs600.c

View file

3

drivers/gpu/drm/radeon/rs690.c

View file

3

drivers/gpu/drm/radeon/rv515.c

View file

3

drivers/gpu/drm/radeon/si.c

View file