drm/amdgpu: move GART struct and function into amdgpu_gart.h v2
Subsystems (2)
PATCH 1/6 drm/amdgpu: move GART struct and function into amdgpu_gart.h v2
From: Christian König <[email protected]>
No functional change, just cleanup.
v2: rebased, keep gart name.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 48 +------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 77 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + 3 files changed, 79 insertions(+), 47 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -47
@@ -69,6 +69,7 @@#include "gpu_scheduler.h" #include "amdgpu_virt.h" +#include "amdgpu_gart.h" /* * Modules parameters.
@@ -534,53 +535,6 @@ int amdgpu_fence_slab_init(void);void amdgpu_fence_slab_fini (void );/* -* GART structures, functions & helpers -*/ -struct amdgpu_mc ; - -#define AMDGPU_GPU_PAGE_SIZE 4096 -#define AMDGPU_GPU_PAGE_MASK (AMDGPU_GPU_PAGE_SIZE - 1) -#define AMDGPU_GPU_PAGE_SHIFT 12 -#define AMDGPU_GPU_PAGE_ALIGN (a) (((a) + AMDGPU_GPU_PAGE_MASK) & ~AMDGPU_GPU_PAGE_MASK) - -struct amdgpu_gart { -dma_addr_t table_addr; -struct amdgpu_bo *robj; -void *ptr; -unsigned num_gpu_pages; -unsigned num_cpu_pages; -unsigned table_size; -#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS -struct page **pages; -#endif -bool ready; - -/* Asic default pte flags */ -uint64_t gart_pte_flags; - -const struct amdgpu_gart_funcs *gart_funcs; -}; - -void amdgpu_gart_set_defaults (struct amdgpu_device *adev); -int amdgpu_gart_table_ram_alloc (struct amdgpu_device *adev); -void amdgpu_gart_table_ram_free (struct amdgpu_device *adev); -int amdgpu_gart_table_vram_alloc (struct amdgpu_device *adev); -void amdgpu_gart_table_vram_free (struct amdgpu_device *adev); -int amdgpu_gart_table_vram_pin (struct amdgpu_device *adev); -void amdgpu_gart_table_vram_unpin (struct amdgpu_device *adev); -int amdgpu_gart_init (struct amdgpu_device *adev); -void amdgpu_gart_fini (struct amdgpu_device *adev); -int amdgpu_gart_unbind (struct amdgpu_device *adev,uint64_t offset, -int pages); -int amdgpu_gart_map (struct amdgpu_device *adev,uint64_t offset, -int pages,dma_addr_t *dma_addr,uint64_t flags, -void *dst); -int amdgpu_gart_bind (struct amdgpu_device *adev,uint64_t offset, -int pages,struct page **pagelist, -dma_addr_t *dma_addr,uint64_t flags); -int amdgpu_ttm_recover_gart (struct amdgpu_device *adev); - -/* * VMHUB structures, functions & helpers */ struct amdgpu_vmhub {
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h new file +77 -0
77 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +1 -0
@@ -80,5 +80,6 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,int amdgpu_mmap (struct file *filp,struct vm_area_struct *vma);bool amdgpu_ttm_is_bound (struct ttm_tt *ttm);int amdgpu_ttm_bind (struct ttm_buffer_object *bo,struct ttm_mem_reg *bo_mem); +int amdgpu_ttm_recover_gart (struct amdgpu_device *adev);#endif
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1499428397-1416-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
PATCH 2/6 drm/amdgpu: remove gtt_base_align handling
From: Christian König <[email protected]>
Not used any more.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 - drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 - drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 - drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 - 6 files changed, 3 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -1
@@ -566,7 +566,6 @@ struct amdgpu_mc {unsigned vram_width;u64 real_vram_size;int vram_mtrr; -u64 gtt_base_align;u64 mc_mask;const struct firmware *fw;/* MC firmware */ uint32_t fw_version;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -3
@@ -697,8 +697,8 @@ void amdgpu_gtt_location(struct amdgpu_device *adev, struct amdgpu_mc *mc) {u64 size_af, size_bf; - size_af = ((adev->mc.mc_mask - mc->vram_end) + mc->gtt_base_align) & ~mc->gtt_base_align; - size_bf = mc->vram_start & ~mc->gtt_base_align; + size_af = adev->mc.mc_mask - mc->vram_end; + size_bf = mc->vram_start;if (size_bf > size_af) {if (mc->gtt_size > size_bf) {dev_warn (adev->dev,"limiting GTT\n" );
@@ -710,7 +710,7 @@ void amdgpu_gtt_location(struct amdgpu_device *adev, struct amdgpu_mc *mc)dev_warn (adev->dev,"limiting GTT\n" ); mc->gtt_size = size_af; } - mc->gtt_start = (mc->vram_end +1 + mc->gtt_base_align) & ~mc->gtt_base_align; + mc->gtt_start = mc->vram_end +1 ; } mc->gtt_end = mc->gtt_start + mc->gtt_size -1 ; dev_info(adev->dev, "GTT: %lluM 0x%016llX - 0x%016llX\n",
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +0 -1
@@ -228,7 +228,6 @@ static void gmc_v6_0_vram_gtt_location(struct amdgpu_device *adev, mc->mc_vram_size =0xFFC0000000ULL ; }amdgpu_vram_location (adev, &adev->mc, base); - adev->mc.gtt_base_align =0 ;amdgpu_gtt_location (adev, mc); }
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +0 -1
@@ -244,7 +244,6 @@ static void gmc_v7_0_vram_gtt_location(struct amdgpu_device *adev, mc->mc_vram_size =0xFFC0000000ULL ; }amdgpu_vram_location (adev, &adev->mc, base); - adev->mc.gtt_base_align =0 ;amdgpu_gtt_location (adev, mc); }
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0 -1
@@ -406,7 +406,6 @@ static void gmc_v8_0_vram_gtt_location(struct amdgpu_device *adev, mc->mc_vram_size =0xFFC0000000ULL ; }amdgpu_vram_location (adev, &adev->mc, base); - adev->mc.gtt_base_align =0 ;amdgpu_gtt_location (adev, mc); }
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0 -1
@@ -420,7 +420,6 @@ static void gmc_v9_0_vram_gtt_location(struct amdgpu_device *adev,if (!amdgpu_sriov_vf (adev)) base =mmhub_v1_0_get_fb_location (adev);amdgpu_vram_location (adev, &adev->mc, base); - adev->mc.gtt_base_align =0 ;amdgpu_gtt_location (adev, mc);/* base offset of vram pages */ if (adev->flags &AMD_IS_APU )
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/6 drm/amdgpu: consistent name all GART related parts
In reply to a message not in the archiveFrom: Christian König <[email protected]>
Rename symbols from gtt_ to gart_ as appropriate.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 22 +++++++------- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 12 ++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 48 +++++++++++++++--------------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 +++---- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 8 ++--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 8 ++--- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 8 ++--- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 8 ++--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 8 ++--- 11 files changed, 72 insertions(+), 72 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +4 -4
@@ -558,9 +558,9 @@ struct amdgpu_mc {* about vram size near mc fb location */ u64 mc_vram_size;u64 visible_vram_size; -u64 gtt_size; -u64 gtt_start; -u64 gtt_end; +u64 gart_size; +u64 gart_start; +u64 gart_end;u64 vram_start;u64 vram_end;unsigned vram_width;
@@ -1863,7 +1863,7 @@ bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm);uint64_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm,struct ttm_mem_reg *mem);void amdgpu_vram_location (struct amdgpu_device *adev,struct amdgpu_mc *mc,u64 base); -void amdgpu_gtt_location (struct amdgpu_device *adev,struct amdgpu_mc *mc); +void amdgpu_gart_location (struct amdgpu_device *adev,struct amdgpu_mc *mc);void amdgpu_ttm_set_active_vram_size (struct amdgpu_device *adev,u64 size);int amdgpu_ttm_init (struct amdgpu_device *adev);void amdgpu_ttm_fini (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +11 -11
@@ -682,7 +682,7 @@ void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 }/** -* amdgpu_gtt_location - try to find GTT location +* amdgpu_gart_location - try to find GTT location * @adev: amdgpu device structure holding all necessary informations * @mc: memory controller structure holding memory informations *
@@ -693,28 +693,28 @@ void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64* * FIXME: when reducing GTT size align new size on power of 2. */ -void amdgpu_gtt_location (struct amdgpu_device *adev,struct amdgpu_mc *mc) +void amdgpu_gart_location (struct amdgpu_device *adev,struct amdgpu_mc *mc) {u64 size_af, size_bf; size_af = adev->mc.mc_mask - mc->vram_end; size_bf = mc->vram_start;if (size_bf > size_af) { -if (mc->gtt_size > size_bf) { +if (mc->gart_size > size_bf) {dev_warn (adev->dev,"limiting GTT\n" ); - mc->gtt_size = size_bf; + mc->gart_size = size_bf; } - mc->gtt_start =0 ; + mc->gart_start =0 ; }else { -if (mc->gtt_size > size_af) { +if (mc->gart_size > size_af) {dev_warn (adev->dev,"limiting GTT\n" ); - mc->gtt_size = size_af; + mc->gart_size = size_af; } - mc->gtt_start = mc->vram_end +1 ; + mc->gart_start = mc->vram_end +1 ; } - mc->gtt_end = mc->gtt_start + mc->gtt_size -1 ; + mc->gart_end = mc->gart_start + mc->gart_size -1 ;dev_info (adev->dev,"GTT: %lluM 0x%016llX - 0x%016llX\n" , - mc->gtt_size >>20 , mc->gtt_start, mc->gtt_end); + mc->gart_size >>20 , mc->gart_start, mc->gart_end); }/*
@@ -2067,7 +2067,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, adev->flags = flags; adev->asic_type = flags &AMD_ASIC_MASK ; adev->usec_timeout =AMDGPU_MAX_USEC_TIMEOUT ; - adev->mc.gtt_size =512 *1024 *1024 ; + adev->mc.gart_size =512 *1024 *1024 ; adev->accel_working = false; adev->num_rings =0 ; adev->mman.buffer_funcs =NULL ;
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +6 -6
@@ -54,11 +54,11 @@*/ /** -* amdgpu_gart_set_defaults - set the default gtt_size +* amdgpu_gart_set_defaults - set the default gart_size * * @adev: amdgpu_device pointer * -* Set the default gtt_size based on parameters and available VRAM. +* Set the default gart_size based on parameters and available VRAM. */ void amdgpu_gart_set_defaults (struct amdgpu_device *adev) {
@@ -66,10 +66,10 @@ void amdgpu_gart_set_defaults(struct amdgpu_device *adev)* size equal to the 1024 or vram, whichever is larger. */ if (amdgpu_gart_size ==-1 ) - adev->mc.gtt_size =max ((AMDGPU_DEFAULT_GTT_SIZE_MB <<20 ), + adev->mc.gart_size =max ((AMDGPU_DEFAULT_GTT_SIZE_MB <<20 ), adev->mc.mc_vram_size);else - adev->mc.gtt_size = (uint64_t )amdgpu_gart_size <<20 ; + adev->mc.gart_size = (uint64_t )amdgpu_gart_size <<20 ; }/**
@@ -384,8 +384,8 @@ int amdgpu_gart_init(struct amdgpu_device *adev)if (r)return r;/* Compute table size */ - adev->gart.num_cpu_pages = adev->mc.gtt_size /PAGE_SIZE ; - adev->gart.num_gpu_pages = adev->mc.gtt_size /AMDGPU_GPU_PAGE_SIZE ; + adev->gart.num_cpu_pages = adev->mc.gart_size /PAGE_SIZE ; + adev->gart.num_gpu_pages = adev->mc.gart_size /AMDGPU_GPU_PAGE_SIZE ;DRM_INFO ("GART: num cpu pages %u, num gpu pages %u\n" , adev->gart.num_cpu_pages, adev->gart.num_gpu_pages);
drivers/gpu/drm/amd/amdgpu/amdgpu_test.c +24 -24
121 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +5 -5
@@ -158,7 +158,7 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,break ;case TTM_PL_TT : man->func = &amdgpu_gtt_mgr_func; - man->gpu_offset = adev->mc.gtt_start; + man->gpu_offset = adev->mc.gart_start; man->available_caching =TTM_PL_MASK_CACHING ; man->default_caching =TTM_PL_FLAG_CACHED ; man->flags =TTM_MEMTYPE_FLAG_MAPPABLE |TTM_MEMTYPE_FLAG_CMA ;
@@ -1144,13 +1144,13 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)DRM_INFO ("amdgpu: %uM of VRAM memory ready\n" , (unsigned ) (adev->mc.real_vram_size / (1024 *1024 ))); r =ttm_bo_init_mm (&adev->mman.bdev,TTM_PL_TT , - adev->mc.gtt_size >>PAGE_SHIFT ); + adev->mc.gart_size >>PAGE_SHIFT );if (r) {DRM_ERROR ("Failed initializing GTT heap.\n" );return r; }DRM_INFO ("amdgpu: %uM of GTT memory ready.\n" , - (unsigned )(adev->mc.gtt_size / (1024 *1024 ))); + (unsigned )(adev->mc.gart_size / (1024 *1024 ))); adev->gds.mem.total_size = adev->gds.mem.total_size <<AMDGPU_GDS_SHIFT ; adev->gds.mem.gfx_partition_size = adev->gds.mem.gfx_partition_size <<AMDGPU_GDS_SHIFT ;
@@ -1279,7 +1279,7 @@ static int amdgpu_map_buffer(struct ttm_buffer_object *bo,BUG_ON (adev->mman.buffer_funcs->copy_max_bytes <AMDGPU_GTT_MAX_TRANSFER_SIZE *8 ); - *addr = adev->mc.gtt_start; + *addr = adev->mc.gart_start; *addr += (u64 )window *AMDGPU_GTT_MAX_TRANSFER_SIZE *AMDGPU_GPU_PAGE_SIZE ;
@@ -1645,7 +1645,7 @@ static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev) adev, &amdgpu_ttm_gtt_fops);if (IS_ERR (ent))return PTR_ERR (ent); -i_size_write (ent->d_inode, adev->mc.gtt_size); +i_size_write (ent->d_inode, adev->mc.gart_size); adev->mman.gtt = ent;#endif
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +4 -4
@@ -58,14 +58,14 @@ static void gfxhub_v1_0_init_gart_aperture_regs(struct amdgpu_device *adev)gfxhub_v1_0_init_gart_pt_regs (adev);WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32, - (u32)(adev->mc.gtt_start >>12 )); + (u32)(adev->mc.gart_start >>12 ));WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32, - (u32)(adev->mc.gtt_start >>44 )); + (u32)(adev->mc.gart_start >>44 ));WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32, - (u32)(adev->mc.gtt_end >>12 )); + (u32)(adev->mc.gart_end >>12 ));WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32, - (u32)(adev->mc.gtt_end >>44 )); + (u32)(adev->mc.gart_end >>44 )); }static void gfxhub_v1_0_init_system_aperture_regs (struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +4 -4
@@ -228,7 +228,7 @@ static void gmc_v6_0_vram_gtt_location(struct amdgpu_device *adev, mc->mc_vram_size =0xFFC0000000ULL ; }amdgpu_vram_location (adev, &adev->mc, base); -amdgpu_gtt_location (adev, mc); +amdgpu_gart_location (adev, mc); }static void gmc_v6_0_mc_program (struct amdgpu_device *adev)
@@ -481,8 +481,8 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev) (4UL <<VM_L2_CNTL3__BANK_SELECT__SHIFT ) | (4UL << VM_L2_CNTL3__L2_CACHE_BIGK_FRAGMENT_SIZE__SHIFT));/* setup context0 */ -WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gtt_start >>12 ); -WREG32 (mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gtt_end >>12 ); +WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gart_start >>12 ); +WREG32 (mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gart_end >>12 );WREG32 (mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, adev->gart.table_addr >>12 );WREG32 (mmVM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR, (u32)(adev->dummy_page.addr >>12 ));
@@ -529,7 +529,7 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)gmc_v6_0_gart_flush_gpu_tlb (adev,0 );dev_info (adev->dev,"PCIE GART of %uM enabled (table at 0x%016llX).\n" , - (unsigned )(adev->mc.gtt_size >>20 ), + (unsigned )(adev->mc.gart_size >>20 ), (unsigned long long )adev->gart.table_addr); adev->gart.ready = true;return 0 ;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +4 -4
@@ -244,7 +244,7 @@ static void gmc_v7_0_vram_gtt_location(struct amdgpu_device *adev, mc->mc_vram_size =0xFFC0000000ULL ; }amdgpu_vram_location (adev, &adev->mc, base); -amdgpu_gtt_location (adev, mc); +amdgpu_gart_location (adev, mc); }/**
@@ -584,8 +584,8 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,4 );WREG32 (mmVM_L2_CNTL3, tmp);/* setup context0 */ -WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gtt_start >>12 ); -WREG32 (mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gtt_end >>12 ); +WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gart_start >>12 ); +WREG32 (mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gart_end >>12 );WREG32 (mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, adev->gart.table_addr >>12 );WREG32 (mmVM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR, (u32)(adev->dummy_page.addr >>12 ));
@@ -639,7 +639,7 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev)gmc_v7_0_gart_flush_gpu_tlb (adev,0 );DRM_INFO ("PCIE GART of %uM enabled (table at 0x%016llX).\n" , - (unsigned )(adev->mc.gtt_size >>20 ), + (unsigned )(adev->mc.gart_size >>20 ), (unsigned long long )adev->gart.table_addr); adev->gart.ready = true;return 0 ;
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +4 -4
@@ -406,7 +406,7 @@ static void gmc_v8_0_vram_gtt_location(struct amdgpu_device *adev, mc->mc_vram_size =0xFFC0000000ULL ; }amdgpu_vram_location (adev, &adev->mc, base); -amdgpu_gtt_location (adev, mc); +amdgpu_gart_location (adev, mc); }/**
@@ -786,8 +786,8 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL4 ,VMC_TAP_CONTEXT1_PTE_REQUEST_SNOOP ,0 );WREG32 (mmVM_L2_CNTL4, tmp);/* setup context0 */ -WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gtt_start >>12 ); -WREG32 (mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gtt_end >>12 ); +WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gart_start >>12 ); +WREG32 (mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gart_end >>12 );WREG32 (mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, adev->gart.table_addr >>12 );WREG32 (mmVM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR, (u32)(adev->dummy_page.addr >>12 ));
@@ -842,7 +842,7 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)gmc_v8_0_gart_flush_gpu_tlb (adev,0 );DRM_INFO ("PCIE GART of %uM enabled (table at 0x%016llX).\n" , - (unsigned )(adev->mc.gtt_size >>20 ), + (unsigned )(adev->mc.gart_size >>20 ), (unsigned long long )adev->gart.table_addr); adev->gart.ready = true;return 0 ;
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +2 -2
@@ -420,7 +420,7 @@ static void gmc_v9_0_vram_gtt_location(struct amdgpu_device *adev,if (!amdgpu_sriov_vf (adev)) base =mmhub_v1_0_get_fb_location (adev);amdgpu_vram_location (adev, &adev->mc, base); -amdgpu_gtt_location (adev, mc); +amdgpu_gart_location (adev, mc);/* base offset of vram pages */ if (adev->flags &AMD_IS_APU ) adev->vm_manager.vram_base_offset =gfxhub_v1_0_get_mc_fb_offset (adev);
@@ -736,7 +736,7 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev)gmc_v9_0_gart_flush_gpu_tlb (adev,0 );DRM_INFO ("PCIE GART of %uM enabled (table at 0x%016llX).\n" , - (unsigned )(adev->mc.gtt_size >>20 ), + (unsigned )(adev->mc.gart_size >>20 ), (unsigned long long )adev->gart.table_addr); adev->gart.ready = true;return 0 ;
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +4 -4
@@ -69,14 +69,14 @@ static void mmhub_v1_0_init_gart_aperture_regs(struct amdgpu_device *adev)mmhub_v1_0_init_gart_pt_regs (adev);WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32, - (u32)(adev->mc.gtt_start >>12 )); + (u32)(adev->mc.gart_start >>12 ));WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32, - (u32)(adev->mc.gtt_start >>44 )); + (u32)(adev->mc.gart_start >>44 ));WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32, - (u32)(adev->mc.gtt_end >>12 )); + (u32)(adev->mc.gart_end >>12 ));WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32, - (u32)(adev->mc.gtt_end >>44 )); + (u32)(adev->mc.gart_end >>44 )); }static void mmhub_v1_0_init_system_aperture_regs (struct amdgpu_device *adev)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/6 drm/amdgpu: limit the GTT manager address space
In reply to a message not in the archiveFrom: Christian König <[email protected]>
We should only cover the GART size with the GTT manager.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +4 -2
@@ -42,6 +42,7 @@ struct amdgpu_gtt_mgr {static int amdgpu_gtt_mgr_init (struct ttm_mem_type_manager *man,unsigned long p_size) { +struct amdgpu_device *adev =amdgpu_ttm_adev (man->bdev);struct amdgpu_gtt_mgr *mgr;uint64_t start, size;
@@ -50,7 +51,7 @@ static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,return -ENOMEM ; start =AMDGPU_GTT_MAX_TRANSFER_SIZE *AMDGPU_GTT_NUM_TRANSFER_WINDOWS ; - size = p_size - start; + size = (adev->mc.gart_size >>PAGE_SHIFT ) - start;drm_mm_init (&mgr->mm, start, size);spin_lock_init (&mgr->lock); mgr->available = p_size;
@@ -112,6 +113,7 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man,const struct ttm_place *place, struct ttm_mem_reg *mem) { + struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);struct amdgpu_gtt_mgr *mgr = man->priv;struct drm_mm_node *node = mem->mm_node;enum drm_mm_insert_mode mode;
@@ -129,7 +131,7 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man,if (place && place->lpfn) lpfn = place->lpfn;else - lpfn = man->size; + lpfn = adev->gart.num_cpu_pages; mode =DRM_MM_INSERT_BEST ;if (place && place->flags &TTM_PL_FLAG_TOPDOWN )
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/6 drm/amdgpu: add new gttsize module parameter
In reply to a message not in the archiveFrom: Christian König <[email protected]>
This allows setting the gtt size independent of the gart size.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 12 +++++++++--- 4 files changed, 21 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -77,6 +77,7 @@extern int amdgpu_modeset;extern int amdgpu_vram_limit;extern int amdgpu_gart_size; +extern int amdgpu_gtt_size;extern int amdgpu_moverate;extern int amdgpu_benchmarking;extern int amdgpu_testing;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7 -0
@@ -1137,6 +1137,13 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev) } } +if (amdgpu_gtt_size !=-1 && amdgpu_gtt_size <32 ) { +/* gtt size must be greater or equal to 32M */ +dev_warn (adev->dev,"gtt size (%d) too small\n" , + amdgpu_gtt_size); + amdgpu_gtt_size =-1 ; + } +amdgpu_check_vm_size (adev);amdgpu_check_block_size (adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +4 -0
@@ -75,6 +75,7 @@int amdgpu_vram_limit =0 ;int amdgpu_gart_size =-1 ;/* auto */ +int amdgpu_gtt_size =-1 ;/* auto */ int amdgpu_moverate =-1 ;/* auto */ int amdgpu_benchmarking =0 ;int amdgpu_testing =0 ;
@@ -124,6 +125,9 @@ module_param_named(vramlimit, amdgpu_vram_limit, int, 0600);MODULE_PARM_DESC (gartsize,"Size of PCIE/IGP gart to setup in megabytes (32, 64, etc., -1 = auto)" );module_param_named (gartsize, amdgpu_gart_size, int,0600 ); +MODULE_PARM_DESC (gttsize,"Size of the GTT domain in megabytes (-1 = auto)" ); +module_param_named (gttsize, amdgpu_gtt_size, int,0600 ); +MODULE_PARM_DESC (moverate,"Maximum buffer migration rate in MB/s. (32, 64, etc., -1=auto, 0=1=disabled)" );module_param_named (moverate, amdgpu_moverate, int,0600 );
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +9 -3
@@ -1097,6 +1097,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = {int amdgpu_ttm_init (struct amdgpu_device *adev) { +uint64_t gtt_size;int r; r =amdgpu_ttm_global_init (adev);
@@ -1143,14 +1144,19 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) }DRM_INFO ("amdgpu: %uM of VRAM memory ready\n" , (unsigned ) (adev->mc.real_vram_size / (1024 *1024 ))); - r =ttm_bo_init_mm (&adev->mman.bdev,TTM_PL_TT , - adev->mc.gart_size >>PAGE_SHIFT ); + +if (amdgpu_gart_size ==-1 ) + gtt_size =max ((AMDGPU_DEFAULT_GTT_SIZE_MB <<20 ), + adev->mc.mc_vram_size); +else + gtt_size = (uint64_t )amdgpu_gart_size <<20 ; + r =ttm_bo_init_mm (&adev->mman.bdev,TTM_PL_TT , gtt_size >>PAGE_SHIFT );if (r) {DRM_ERROR ("Failed initializing GTT heap.\n" );return r; }DRM_INFO ("amdgpu: %uM of GTT memory ready.\n" , - (unsigned )(adev->mc.gart_size / (1024 *1024 ))); + (unsigned )(gtt_size / (1024 *1024 ))); adev->gds.mem.total_size = adev->gds.mem.total_size <<AMDGPU_GDS_SHIFT ; adev->gds.mem.gfx_partition_size = adev->gds.mem.gfx_partition_size <<AMDGPU_GDS_SHIFT ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1499428397-1416-5-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 5/6] drm/amdgpu: add new gttsize module parameter
Quoted 93 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian König
Sent: Friday, July 07, 2017 7:53 AM
To: [email protected]
Subject: [PATCH 5/6] drm/amdgpu: add new gttsize module parameterFrom: Christian König <[email protected]>
This allows setting the gtt size independent of the gart size.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 12 +++++++++--- 4 files changed, 21 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -77,6 +77,7 @@extern int amdgpu_modeset;extern int amdgpu_vram_limit;extern int amdgpu_gart_size; +extern int amdgpu_gtt_size;extern int amdgpu_moverate;extern int amdgpu_benchmarking;extern int amdgpu_testing;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7
-0@@ -1137,6 +1137,13 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev) } } +if (amdgpu_gtt_size !=-1 && amdgpu_gtt_size <32 ) { +/* gtt size must be greater or equal to 32M */ +dev_warn (adev->dev,"gtt size (%d) too small\n" , + amdgpu_gtt_size); + amdgpu_gtt_size =-1 ; + } +amdgpu_check_vm_size (adev);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0amdgpu_check_block_size (adev);drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +4
-0@@ -75,6 +75,7 @@int amdgpu_vram_limit =0 ;int amdgpu_gart_size =-1 ;/* auto */ +int amdgpu_gtt_size =-1 ;/* auto */ int amdgpu_moverate =-1 ;/* auto */ int amdgpu_benchmarking =0 ;int amdgpu_testing =0 ;@@ -124,6 +125,9 @@ module_param_named(vramlimit, amdgpu_vram_limit, int, 0600); MODULE_PARM_DESC(gartsize, "Size of PCIE/IGP gart to setup in megabytes (32, 64, etc., -1 = auto)"); module_param_named(gartsize, amdgpu_gart_size, int,0600 ); +MODULE_PARM_DESC(gttsize, "Size of the GTT domain in megabytes (-1 = auto)"); +module_param_named(gttsize, amdgpu_gtt_size, int,0600 ); +MODULE_PARM_DESC(moverate, "Maximum buffer migration rate in MB/s.
(32, 64, etc., -1=auto, 0=1=disabled)");
module_param_named(moverate, amdgpu_moverate, int, 0600);drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1
-0@@ -1097,6 +1097,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = {int amdgpu_ttm_init (struct amdgpu_device *adev) { +uint64_t gtt_size;int r; r =amdgpu_ttm_global_init (adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c int amdgpu_ttm_init(struct amdgpu_device · line 1149
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2
-2@@ -1143,14 +1144,19 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) }DRM_INFO ("amdgpu: %uM of VRAM memory ready\n" , (unsigned ) (adev->mc.real_vram_size / (1024 *1024 ))); - r =ttm_bo_init_mm (&adev->mman.bdev,TTM_PL_TT , - adev->mc.gart_size >>PAGE_SHIFT ); + +if (amdgpu_gart_size ==-1 )
amdgpu_gtt_size here. With that fixed:
Quoted 17 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +6
-1+ gtt_size =max ((AMDGPU_DEFAULT_GTT_SIZE_MB <<20 ), + adev->mc.mc_vram_size); + else + gtt_size = (uint64_t )amdgpu_gart_size <<20 ; + r =ttm_bo_init_mm (&adev->mman.bdev,TTM_PL_TT , gtt_size >>PAGE_SHIFT );if (r) {DRM_ERROR ("Failed initializing GTT heap.\n" );return r; }DRM_INFO ("amdgpu: %uM of GTT memory ready.\n" , - (unsigned )(adev->mc.gart_size / (1024 *1024 ))); + (unsigned )(gtt_size / (1024 *1024 )));
adev->gds.mem.total_size=adev->gds.mem.total_size<<AMDGPU_GDS_SHIFT;
adev->gds.mem.gfx_partition_size= adev-
Quoted 8 lines
Quoted 1 line
gds.mem.gfx_partition_size <<
AMDGPU_GDS_SHIFT;--
2.7.4_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/6 drm/amdgpu: change gartsize default to 256MB
In reply to a message not in the archiveFrom: Christian König <[email protected]>
Limit the default GART size and save a lot of VRAM.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +++++------- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 9 +-------- 4 files changed, 10 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -76,7 +76,7 @@*/ extern int amdgpu_modeset;extern int amdgpu_vram_limit; -extern int amdgpu_gart_size; +extern unsigned amdgpu_gart_size;extern int amdgpu_gtt_size;extern int amdgpu_moverate;extern int amdgpu_benchmarking;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5 -7
@@ -1128,13 +1128,11 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev) amdgpu_sched_jobs =roundup_pow_of_two (amdgpu_sched_jobs); } -if (amdgpu_gart_size !=-1 ) { -/* gtt size must be greater or equal to 32M */ -if (amdgpu_gart_size <32 ) { -dev_warn (adev->dev,"gart size (%d) too small\n" , - amdgpu_gart_size); - amdgpu_gart_size =-1 ; - } +if (amdgpu_gart_size <32 ) { +/* gart size must be greater or equal to 32M */ +dev_warn (adev->dev,"gart size (%d) too small\n" , + amdgpu_gart_size); + amdgpu_gart_size =32 ; }if (amdgpu_gtt_size !=-1 && amdgpu_gtt_size <32 ) {
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +3 -3
@@ -74,7 +74,7 @@#define KMS_DRIVER_PATCHLEVEL 0int amdgpu_vram_limit =0 ; -int amdgpu_gart_size =-1 ;/* auto */ +unsigned amdgpu_gart_size =256 ;int amdgpu_gtt_size =-1 ;/* auto */ int amdgpu_moverate =-1 ;/* auto */ int amdgpu_benchmarking =0 ;
@@ -122,8 +122,8 @@ int amdgpu_lbpw = -1;MODULE_PARM_DESC (vramlimit,"Restrict VRAM for testing, in megabytes" );module_param_named (vramlimit, amdgpu_vram_limit, int,0600 ); -MODULE_PARM_DESC (gartsize,"Size of PCIE/IGP gart to setup in megabytes (32, 64, etc., -1 = auto)" ); -module_param_named (gartsize, amdgpu_gart_size, int,0600 ); +MODULE_PARM_DESC (gartsize,"Size of PCIE/IGP gart to setup in megabytes (32, 64, etc.)" ); +module_param_named (gartsize, amdgpu_gart_size, uint,0600 );MODULE_PARM_DESC (gttsize,"Size of the GTT domain in megabytes (-1 = auto)" );module_param_named (gttsize, amdgpu_gtt_size, int,0600 );
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +1 -8
@@ -62,14 +62,7 @@*/ void amdgpu_gart_set_defaults (struct amdgpu_device *adev) { -/* unless the user had overridden it, set the gart -* size equal to the 1024 or vram, whichever is larger. -*/ -if (amdgpu_gart_size ==-1 ) - adev->mc.gart_size =max ((AMDGPU_DEFAULT_GTT_SIZE_MB <<20 ), - adev->mc.mc_vram_size); -else - adev->mc.gart_size = (uint64_t )amdgpu_gart_size <<20 ; + adev->mc.gart_size = (uint64_t )amdgpu_gart_size <<20 ; }/**
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1499428397-1416-6-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 6/6] drm/amdgpu: change gartsize default to 256MB
Quoted 7 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian König
Sent: Friday, July 07, 2017 7:53 AM
To: [email protected]
Subject: [PATCH 6/6] drm/amdgpu: change gartsize default to 256MB
Quoted 5 lines
From: Christian König <[email protected]>
Limit the default GART size and save a lot of VRAM.
Signed-off-by Christian König <[email protected]>
Patch 1-4, 6:
Quoted 101 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +++++------- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 9 +-------- 4 files changed, 10 insertions(+), 19 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-1@@ -76,7 +76,7 @@*/ extern int amdgpu_modeset;extern int amdgpu_vram_limit; -extern int amdgpu_gart_size; +extern unsigned amdgpu_gart_size;extern int amdgpu_gtt_size;extern int amdgpu_moverate;extern int amdgpu_benchmarking;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5
-7@@ -1128,13 +1128,11 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev) amdgpu_sched_jobs =roundup_pow_of_two (amdgpu_sched_jobs); } -if (amdgpu_gart_size !=-1 ) { -/* gtt size must be greater or equal to 32M */ -if (amdgpu_gart_size <32 ) { -dev_warn (adev->dev,"gart size (%d) too small\n" , - amdgpu_gart_size); - amdgpu_gart_size =-1 ; - } +if (amdgpu_gart_size <32 ) { +/* gart size must be greater or equal to 32M */ +dev_warn (adev->dev,"gart size (%d) too small\n" , + amdgpu_gart_size); + amdgpu_gart_size =32 ; }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0if (amdgpu_gtt_size !=-1 && amdgpu_gtt_size <32 ) {drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +3
-3@@ -74,7 +74,7 @@#define KMS_DRIVER_PATCHLEVEL 0int amdgpu_vram_limit =0 ; -int amdgpu_gart_size =-1 ;/* auto */ +unsigned amdgpu_gart_size =256 ;int amdgpu_gtt_size =-1 ;/* auto */ int amdgpu_moverate =-1 ;/* auto */ int amdgpu_benchmarking =0 ;@@ -122,8 +122,8 @@ int amdgpu_lbpw = -1;MODULE_PARM_DESC (vramlimit,"Restrict VRAM for testing, in megabytes");module_param_named (vramlimit, amdgpu_vram_limit, int,0600 ); -MODULE_PARM_DESC(gartsize, "Size of PCIE/IGP gart to setup in megabytes (32, 64, etc., -1 = auto)"); -module_param_named(gartsize, amdgpu_gart_size, int,0600 ); +MODULE_PARM_DESC(gartsize, "Size of PCIE/IGP gart to setup in megabytes (32, 64, etc.)"); +module_param_named(gartsize, amdgpu_gart_size, uint, 0600);MODULE_PARM_DESC(gttsize, "Size of the GTT domain in megabytes (-1 =
auto)");
module_param_named(gttsize, amdgpu_gtt_size, int, 0600);drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +1
-8@@ -62,14 +62,7 @@*/ void amdgpu_gart_set_defaults (struct amdgpu_device *adev) { -/* unless the user had overridden it, set the gart -* size equal to the 1024 or vram, whichever is larger. -*/ -if (amdgpu_gart_size ==-1 ) - adev->mc.gart_size =max ((AMDGPU_DEFAULT_GTT_SIZE_MB <<20 ), - adev->mc.mc_vram_size); -else - adev->mc.gart_size = (uint64_t )amdgpu_gart_size <<20 ; + adev->mc.gart_size = (uint64_t)amdgpu_gart_size << 20; }/**
--
2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): BN6PR12MB1652C648843F3FABB97B5E0AF7AA0-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH 6/6] drm/amdgpu: change gartsize default to 256MB
Bit late, but this causes a startup fail for me with r9 285 , nothing logged, just a blank screen when the driver loads.
Heads of both amd-staging-4.11 and drm-next-4.14-wip both failing.
Quoted 117 lines · Alexander
Quoted 7 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian König
Sent: Friday, July 07, 2017 7:53 AM
To: [email protected]
Subject: [PATCH 6/6] drm/amdgpu: change gartsize default to 256MBQuoted 5 lines
From: Christian König <[email protected]>
Limit the default GART size and save a lot of VRAM.
Signed-off-by Christian König <[email protected]>Patch 1-4, 6:
Reviewed-by Alex Deucher <[email protected]>Quoted 101 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +++++------- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 9 +-------- 4 files changed, 10 insertions(+), 19 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-1@@ -76,7 +76,7 @@*/ extern int amdgpu_modeset;extern int amdgpu_vram_limit; -extern int amdgpu_gart_size; +extern unsigned amdgpu_gart_size;extern int amdgpu_gtt_size;extern int amdgpu_moverate;extern int amdgpu_benchmarking;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5
-7@@ -1128,13 +1128,11 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev) amdgpu_sched_jobs =roundup_pow_of_two (amdgpu_sched_jobs); } -if (amdgpu_gart_size !=-1 ) { -/* gtt size must be greater or equal to 32M */ -if (amdgpu_gart_size <32 ) { -dev_warn (adev->dev,"gart size (%d) too small\n" , - amdgpu_gart_size); - amdgpu_gart_size =-1 ; - } +if (amdgpu_gart_size <32 ) { +/* gart size must be greater or equal to 32M */ +dev_warn (adev->dev,"gart size (%d) too small\n" , + amdgpu_gart_size); + amdgpu_gart_size =32 ; }if (amdgpu_gtt_size != -1 && amdgpu_gtt_size < 32) {drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +3
-3@@ -74,7 +74,7 @@#define KMS_DRIVER_PATCHLEVEL 0int amdgpu_vram_limit =0 ; -int amdgpu_gart_size =-1 ;/* auto */ +unsigned amdgpu_gart_size =256 ;int amdgpu_gtt_size =-1 ;/* auto */ int amdgpu_moverate =-1 ;/* auto */ int amdgpu_benchmarking =0 ;@@ -122,8 +122,8 @@ int amdgpu_lbpw = -1;MODULE_PARM_DESC (vramlimit,"Restrict VRAM for testing, in megabytes");module_param_named (vramlimit, amdgpu_vram_limit, int,0600 ); -MODULE_PARM_DESC(gartsize, "Size of PCIE/IGP gart to setup in megabytes (32, 64, etc., -1 = auto)"); -module_param_named(gartsize, amdgpu_gart_size, int,0600 ); +MODULE_PARM_DESC(gartsize, "Size of PCIE/IGP gart to setup in megabytes (32, 64, etc.)"); +module_param_named(gartsize, amdgpu_gart_size, uint, 0600);MODULE_PARM_DESC(gttsize, "Size of the GTT domain in megabytes (-1 =
auto)");
module_param_named(gttsize, amdgpu_gtt_size, int, 0600);drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +1
-8@@ -62,14 +62,7 @@*/ void amdgpu_gart_set_defaults (struct amdgpu_device *adev) { -/* unless the user had overridden it, set the gart -* size equal to the 1024 or vram, whichever is larger. -*/ -if (amdgpu_gart_size ==-1 ) - adev->mc.gart_size =max ((AMDGPU_DEFAULT_GTT_SIZE_MB <<20 ), - adev->mc.mc_vram_size); -else - adev->mc.gart_size = (uint64_t )amdgpu_gart_size <<20 ; + adev->mc.gart_size = (uint64_t)amdgpu_gart_size << 20; }/**
--
2.7.4
Quoted 9 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 16c951e9-5ea5-f4d0-e0f8-88ee37ce8c27-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Re: [PATCH 6/6] drm/amdgpu: change gartsize default to 256MB
Quoted 3 lines · Andy Furniss
Bit late, but this causes a startup fail for me with r9 285 , nothing logged, just a blank screen when the driver loads.
Heads of both amd-staging-4.11 and drm-next-4.14-wip both failing.
Both branches are OK now after the latest updates.
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx