Skip to content

Commit 5767603

Browse files
drm/qxl: stop using TTM_MEMTYPE_FLAG_MAPPABLE v2
The driver doesn't expose any not-mapable memory resources. v2: remove unused man variable as well Signed-off-by: Christian König <[email protected]> Reviewed-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/378246/
1 parent ed024ca commit 5767603

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

drivers/gpu/drm/qxl/qxl_ttm.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,15 @@ static int qxl_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
5454
switch (type) {
5555
case TTM_PL_SYSTEM:
5656
/* System memory */
57-
man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
57+
man->flags = 0;
5858
man->available_caching = TTM_PL_MASK_CACHING;
5959
man->default_caching = TTM_PL_FLAG_CACHED;
6060
break;
6161
case TTM_PL_VRAM:
6262
case TTM_PL_PRIV:
6363
/* "On-card" video ram */
6464
man->func = &ttm_bo_manager_func;
65-
man->flags = TTM_MEMTYPE_FLAG_FIXED |
66-
TTM_MEMTYPE_FLAG_MAPPABLE;
65+
man->flags = TTM_MEMTYPE_FLAG_FIXED;
6766
man->available_caching = TTM_PL_MASK_CACHING;
6867
man->default_caching = TTM_PL_FLAG_CACHED;
6968
break;
@@ -99,16 +98,14 @@ static void qxl_evict_flags(struct ttm_buffer_object *bo,
9998
int qxl_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
10099
struct ttm_mem_reg *mem)
101100
{
102-
struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
103101
struct qxl_device *qdev = qxl_get_qdev(bdev);
104102

105103
mem->bus.addr = NULL;
106104
mem->bus.offset = 0;
107105
mem->bus.size = mem->num_pages << PAGE_SHIFT;
108106
mem->bus.base = 0;
109107
mem->bus.is_iomem = false;
110-
if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE))
111-
return -EINVAL;
108+
112109
switch (mem->mem_type) {
113110
case TTM_PL_SYSTEM:
114111
/* system memory */

0 commit comments

Comments
 (0)