Merge branch 'drm-radeon-testing' of /ssd/git/drm-radeon-next into drm-next-stage

Browse source

* 'drm-radeon-testing' of /ssd/git/drm-radeon-next:
  drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond
  drm/ttm: fix function prototype to match implementation
  drm/radeon: use ALIGN instead of open coding it
  drm/radeon/kms: initialize set_surface_reg reg for rs600 asic

...

This commit is contained in:

Dave Airlie 2010-03-01 16:08:57 +10:00

parent cf7934a2a0 566d84d172

commit 68de774582

7 changed files with 15 additions and 4 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/r600_blit.c

View file

4

drivers/gpu/drm/radeon/r600_blit_kms.c

View file

2

drivers/gpu/drm/radeon/radeon_asic.h

View file

1

drivers/gpu/drm/radeon/radeon_cp.c

View file

2

drivers/gpu/drm/radeon/radeon_drv.h

View file

6

drivers/gpu/drm/radeon/radeon_state.c

View file

2

include/drm/ttm/ttm_bo_driver.h

View file