* '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
Showing the changes to include/drm (1 of 7 files). Show all
Unified · Split
| @@ -908,7 +908,7 @@ extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, · 907 unmodified lines | |||
| 908 | * Utility function that returns the pgprot_t that should be used for | 908 | * Utility function that returns the pgprot_t that should be used for |
| 909 | * setting up a PTE with the caching model indicated by @c_state. | 909 | * setting up a PTE with the caching model indicated by @c_state. |
| 910 | */ | 910 | */ |
| 911 | extern pgprot_t ttm_io_prot(enum ttm_caching_state c_state, pgprot_t tmp); | 911 | extern pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp); |
| 912 | 912 | ||
| 913 | #if (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) | 913 | #if (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) |
| 914 | #define TTM_HAS_AGP | 914 | #define TTM_HAS_AGP |