aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/ttm/ttm_bo_api.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index cd22ab4b495c..99dc521aa1a9 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -245,14 +245,15 @@ struct ttm_buffer_object {
245 * premapped region. 245 * premapped region.
246 */ 246 */
247 247
248#define TTM_BO_MAP_IOMEM_MASK 0x80
248struct ttm_bo_kmap_obj { 249struct ttm_bo_kmap_obj {
249 void *virtual; 250 void *virtual;
250 struct page *page; 251 struct page *page;
251 enum { 252 enum {
252 ttm_bo_map_iomap, 253 ttm_bo_map_iomap = 1 | TTM_BO_MAP_IOMEM_MASK,
253 ttm_bo_map_vmap, 254 ttm_bo_map_vmap = 2,
254 ttm_bo_map_kmap, 255 ttm_bo_map_kmap = 3,
255 ttm_bo_map_premapped, 256 ttm_bo_map_premapped = 4 | TTM_BO_MAP_IOMEM_MASK,
256 } bo_kmap_type; 257 } bo_kmap_type;
257}; 258};
258 259
@@ -522,8 +523,7 @@ extern int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type);
522static inline void *ttm_kmap_obj_virtual(struct ttm_bo_kmap_obj *map, 523static inline void *ttm_kmap_obj_virtual(struct ttm_bo_kmap_obj *map,
523 bool *is_iomem) 524 bool *is_iomem)
524{ 525{
525 *is_iomem = (map->bo_kmap_type == ttm_bo_map_iomap || 526 *is_iomem = !!(map->bo_kmap_type & TTM_BO_MAP_IOMEM_MASK);
526 map->bo_kmap_type == ttm_bo_map_premapped);
527 return map->virtual; 527 return map->virtual;
528} 528}
529 529