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

Browse source

A number of fixes, and one revert for a patch having some wierd side effects.

* 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux:
  Revert "drm/radeon: do not move bo to different placement at each cs"
  drm/radeon: improve semaphore debugging on lockup
  drm/radeon: allow FP16 color clear registers on r500
  drm/radeon: clear reset flags if engines are idle

...

This commit is contained in:

Dave Airlie 2013-01-21 13:24:12 +10:00

parent 7b4cf994e4 20707874fd

commit a3f5aed42f

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

6

drivers/gpu/drm/radeon/evergreen.c

View file

6

drivers/gpu/drm/radeon/ni.c

View file

6

drivers/gpu/drm/radeon/r600.c

View file

3

drivers/gpu/drm/radeon/radeon.h

View file

3

drivers/gpu/drm/radeon/radeon_drv.c

View file

18

drivers/gpu/drm/radeon/radeon_object.c

View file

2

drivers/gpu/drm/radeon/radeon_ring.c

View file

4

drivers/gpu/drm/radeon/radeon_semaphore.c

View file

2

drivers/gpu/drm/radeon/reg_srcs/rv515

View file

6

drivers/gpu/drm/radeon/si.c

View file