UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/bar: add noncached ioremap property 

Some BARs (like GK20A's) do not support being ioremapped write-combined.
Add a boolean property to the BAR structure and handle that case in the
Nouveau BO implementation.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
This commit is contained in:
Alexandre Courbot 2014-06-27 19:28:50 +09:00 committed by Ben Skeggs
parent 8ba9ff1163
commit e2a4e78cdc
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/nouveau/core/include/subdev/bar.h
View File

@ -20,6 +20,9 @@ struct nouveau_bar {
u32 flags, struct nouveau_vma *); u32 flags, struct nouveau_vma *);
void (*unmap)(struct nouveau_bar *, struct nouveau_vma *); void (*unmap)(struct nouveau_bar *, struct nouveau_vma *);
void (*flush)(struct nouveau_bar *); void (*flush)(struct nouveau_bar *);
/* whether the BAR supports to be ioremapped WC or should be uncached */
bool iomap_uncached;
}; };
static inline struct nouveau_bar * static inline struct nouveau_bar *

17
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@ -500,18 +500,25 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
man->default_caching = TTM_PL_FLAG_CACHED; man->default_caching = TTM_PL_FLAG_CACHED;
break; break;
case TTM_PL_VRAM: case TTM_PL_VRAM:
man->flags = TTM_MEMTYPE_FLAG_FIXED |
TTM_MEMTYPE_FLAG_MAPPABLE;
man->available_caching = TTM_PL_FLAG_UNCACHED |
TTM_PL_FLAG_WC;
man->default_caching = TTM_PL_FLAG_WC;
if (nv_device(drm->device)->card_type >= NV_50) { if (nv_device(drm->device)->card_type >= NV_50) {
/* Some BARs do not support being ioremapped WC */
if (nouveau_bar(drm->device)->iomap_uncached) {
man->available_caching = TTM_PL_FLAG_UNCACHED;
man->default_caching = TTM_PL_FLAG_UNCACHED;
}
man->func = &nouveau_vram_manager; man->func = &nouveau_vram_manager;
man->io_reserve_fastpath = false; man->io_reserve_fastpath = false;
man->use_io_reserve_lru = true; man->use_io_reserve_lru = true;
} else { } else {
man->func = &ttm_bo_manager_func; man->func = &ttm_bo_manager_func;
} }
man->flags = TTM_MEMTYPE_FLAG_FIXED |
TTM_MEMTYPE_FLAG_MAPPABLE;
man->available_caching = TTM_PL_FLAG_UNCACHED |
TTM_PL_FLAG_WC;
man->default_caching = TTM_PL_FLAG_WC;
break; break;
case TTM_PL_TT: case TTM_PL_TT:
if (nv_device(drm->device)->card_type >= NV_50) if (nv_device(drm->device)->card_type >= NV_50)