Am 23.07.20 um 17:17 schrieb Christian König: > Instead of repeating that in each driver. > > Signed-off-by: Christian König Reviewed-by: Thomas Zimmermann > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 --- > drivers/gpu/drm/drm_gem_vram_helper.c | 3 --- > drivers/gpu/drm/nouveau/nouveau_bo.c | 3 --- > drivers/gpu/drm/qxl/qxl_ttm.c | 3 --- > drivers/gpu/drm/radeon/radeon_ttm.c | 3 --- > drivers/gpu/drm/ttm/ttm_bo.c | 2 ++ > drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 -- > 7 files changed, 2 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > index 0dd5e802091d..e57c49a91b73 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > @@ -84,9 +84,6 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, > switch (type) { > case TTM_PL_SYSTEM: > /* System memory */ > - man->flags = 0; > - man->available_caching = TTM_PL_MASK_CACHING; > - man->default_caching = TTM_PL_FLAG_CACHED; > break; > case TTM_PL_TT: > /* GTT memory */ > diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c > index 3296ed3df358..be177afdeb9a 100644 > --- a/drivers/gpu/drm/drm_gem_vram_helper.c > +++ b/drivers/gpu/drm/drm_gem_vram_helper.c > @@ -1009,9 +1009,6 @@ static int bo_driver_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, > { > switch (type) { > case TTM_PL_SYSTEM: > - man->flags = 0; > - man->available_caching = TTM_PL_MASK_CACHING; > - man->default_caching = TTM_PL_FLAG_CACHED; > break; > case TTM_PL_VRAM: > man->func = &ttm_bo_manager_func; > diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c > index 4ccf937df0d0..53af25020bb2 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_bo.c > +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c > @@ -655,9 +655,6 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, > > switch (type) { > case TTM_PL_SYSTEM: > - man->flags = 0; > - man->available_caching = TTM_PL_MASK_CACHING; > - man->default_caching = TTM_PL_FLAG_CACHED; > break; > case TTM_PL_VRAM: > man->flags = TTM_MEMTYPE_FLAG_FIXED; > diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c > index 1d8e07b8b19e..e9b8c921c1f0 100644 > --- a/drivers/gpu/drm/qxl/qxl_ttm.c > +++ b/drivers/gpu/drm/qxl/qxl_ttm.c > @@ -54,9 +54,6 @@ static int qxl_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, > switch (type) { > case TTM_PL_SYSTEM: > /* System memory */ > - man->flags = 0; > - man->available_caching = TTM_PL_MASK_CACHING; > - man->default_caching = TTM_PL_FLAG_CACHED; > break; > case TTM_PL_VRAM: > case TTM_PL_PRIV: > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c > index b474781a0920..b4cb75361577 100644 > --- a/drivers/gpu/drm/radeon/radeon_ttm.c > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c > @@ -76,9 +76,6 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, > switch (type) { > case TTM_PL_SYSTEM: > /* System memory */ > - man->flags = 0; > - man->available_caching = TTM_PL_MASK_CACHING; > - man->default_caching = TTM_PL_FLAG_CACHED; > break; > case TTM_PL_TT: > man->func = &ttm_bo_manager_func; > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > index 7c02ce784805..1f1f9e463265 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -1677,6 +1677,8 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev, > * Initialize the system memory buffer type. > * Other types need to be driver / IOCTL initialized. > */ > + bdev->man[TTM_PL_SYSTEM].available_caching = TTM_PL_MASK_CACHING; > + bdev->man[TTM_PL_SYSTEM].default_caching = TTM_PL_FLAG_CACHED; > ret = ttm_bo_init_mm(bdev, TTM_PL_SYSTEM, 0); > if (unlikely(ret != 0)) > goto out_no_sys; > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c > index 1d78187eaba6..00cef1a3a178 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c > @@ -742,8 +742,6 @@ static int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, > switch (type) { > case TTM_PL_SYSTEM: > /* System memory */ > - man->available_caching = TTM_PL_FLAG_CACHED; > - man->default_caching = TTM_PL_FLAG_CACHED; > break; > case TTM_PL_VRAM: > /* "On-card" video ram */ > -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer