* [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains
@ 2014-06-02 15:33 Christian König
2014-06-02 15:33 ` [PATCH 2/4] drm/radeon: make VM size a module parameter Christian König
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Christian König @ 2014-06-02 15:33 UTC (permalink / raw)
To: alexdeucher; +Cc: dri-devel
From: Christian König <christian.koenig@amd.com>
And also domain to prefered_domains. That matches better
what those values represent.
Signed-off-by: Christian König <christian.koenig@amd.com>
Cc: Marek Olšák <maraeo@gmail.com>
---
drivers/gpu/drm/radeon/radeon.h | 4 ++--
drivers/gpu/drm/radeon/radeon_cs.c | 8 ++++----
drivers/gpu/drm/radeon/radeon_object.c | 9 +++++----
drivers/gpu/drm/radeon/radeon_vm.c | 8 ++++----
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 7501ba31..babb7f1 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -997,8 +997,8 @@ struct radeon_cs_reloc {
struct radeon_bo *robj;
struct ttm_validate_buffer tv;
uint64_t gpu_offset;
- unsigned domain;
- unsigned alt_domain;
+ unsigned prefered_domains;
+ unsigned allowed_domains;
uint32_t tiling_flags;
uint32_t handle;
};
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 41ecf8a..71a1434 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -140,10 +140,10 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
if (p->ring == R600_RING_TYPE_UVD_INDEX &&
(i == 0 || drm_pci_device_is_agp(p->rdev->ddev))) {
/* TODO: is this still needed for NI+ ? */
- p->relocs[i].domain =
+ p->relocs[i].prefered_domains =
RADEON_GEM_DOMAIN_VRAM;
- p->relocs[i].alt_domain =
+ p->relocs[i].allowed_domains =
RADEON_GEM_DOMAIN_VRAM;
/* prioritize this over any other relocation */
@@ -158,10 +158,10 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
return -EINVAL;
}
- p->relocs[i].domain = domain;
+ p->relocs[i].prefered_domains = domain;
if (domain == RADEON_GEM_DOMAIN_VRAM)
domain |= RADEON_GEM_DOMAIN_GTT;
- p->relocs[i].alt_domain = domain;
+ p->relocs[i].allowed_domains = domain;
}
p->relocs[i].tv.bo = &p->relocs[i].robj->tbo;
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index 2918087..6c717b2 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -446,7 +446,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
list_for_each_entry(lobj, head, tv.head) {
bo = lobj->robj;
if (!bo->pin_count) {
- u32 domain = lobj->domain;
+ u32 domain = lobj->prefered_domains;
u32 current_domain =
radeon_mem_type_to_domain(bo->tbo.mem.mem_type);
@@ -458,7 +458,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
* into account. We don't want to disallow buffer moves
* completely.
*/
- if ((lobj->alt_domain & current_domain) != 0 &&
+ if ((lobj->allowed_domains & current_domain) != 0 &&
(domain & current_domain) == 0 && /* will be moved */
bytes_moved > bytes_moved_threshold) {
/* don't move it */
@@ -476,8 +476,9 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
initial_bytes_moved;
if (unlikely(r)) {
- if (r != -ERESTARTSYS && domain != lobj->alt_domain) {
- domain = lobj->alt_domain;
+ if (r != -ERESTARTSYS &&
+ domain != lobj->allowed_domains) {
+ domain = lobj->allowed_domains;
goto retry;
}
ttm_eu_backoff_reservation(ticket, head);
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index a72e9c8..d3c9161 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -140,8 +140,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
/* add the vm page table to the list */
list[0].gobj = NULL;
list[0].robj = vm->page_directory;
- list[0].domain = RADEON_GEM_DOMAIN_VRAM;
- list[0].alt_domain = RADEON_GEM_DOMAIN_VRAM;
+ list[0].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
+ list[0].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
list[0].tv.bo = &vm->page_directory->tbo;
list[0].tiling_flags = 0;
list[0].handle = 0;
@@ -153,8 +153,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
list[idx].gobj = NULL;
list[idx].robj = vm->page_tables[i].bo;
- list[idx].domain = RADEON_GEM_DOMAIN_VRAM;
- list[idx].alt_domain = RADEON_GEM_DOMAIN_VRAM;
+ list[idx].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
+ list[idx].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
list[idx].tv.bo = &list[idx].robj->tbo;
list[idx].tiling_flags = 0;
list[idx].handle = 0;
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/4] drm/radeon: make VM size a module parameter
2014-06-02 15:33 [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains Christian König
@ 2014-06-02 15:33 ` Christian König
2014-06-02 15:49 ` Alex Deucher
2014-06-02 15:33 ` [PATCH 3/4] drm/radeon: make vm_block_size " Christian König
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Christian König @ 2014-06-02 15:33 UTC (permalink / raw)
To: alexdeucher; +Cc: dri-devel
From: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/radeon/cik.c | 2 +-
drivers/gpu/drm/radeon/ni.c | 3 ++-
drivers/gpu/drm/radeon/radeon.h | 2 +-
drivers/gpu/drm/radeon/radeon_device.c | 27 +++++++++++++++++++++------
drivers/gpu/drm/radeon/radeon_drv.c | 4 ++++
drivers/gpu/drm/radeon/radeon_vm.c | 6 +++---
drivers/gpu/drm/radeon/si.c | 2 +-
7 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 69a00d6..be464d0 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -5431,7 +5431,7 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev)
*/
/* set vm size, must be a multiple of 4 */
WREG32(VM_CONTEXT1_PAGE_TABLE_START_ADDR, 0);
- WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, rdev->vm_manager.max_pfn);
+ WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, radeon_vm_size << 8);
for (i = 1; i < 16; i++) {
if (i < 8)
WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 1d3209f..ff7cbbc 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1258,7 +1258,8 @@ static int cayman_pcie_gart_enable(struct radeon_device *rdev)
*/
for (i = 1; i < 8; i++) {
WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR + (i << 2), 0);
- WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR + (i << 2), rdev->vm_manager.max_pfn);
+ WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR + (i << 2),
+ radeon_vm_size << 8);
WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
rdev->gart.table_addr >> 12);
}
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index babb7f1..3d8b4fd 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -100,6 +100,7 @@ extern int radeon_dpm;
extern int radeon_aspm;
extern int radeon_runtime_pm;
extern int radeon_hard_reset;
+extern int radeon_vm_size;
/*
* Copy from radeon_drv.h so we don't have to include both and have conflicting
@@ -893,7 +894,6 @@ struct radeon_vm {
struct radeon_vm_manager {
struct radeon_fence *active[RADEON_NUM_VM];
- uint32_t max_pfn;
/* number of VMIDs */
unsigned nvm;
/* vram base address for page table entry */
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 26e1882..83032a6 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1052,6 +1052,27 @@ static void radeon_check_arguments(struct radeon_device *rdev)
radeon_agpmode = 0;
break;
}
+
+ if (!radeon_check_pot_argument(radeon_vm_size)) {
+ dev_warn(rdev->dev, "VM size (%d) must be a power of 2\n",
+ radeon_vm_size);
+ radeon_vm_size = 4096;
+ }
+
+ if (radeon_vm_size < 4) {
+ dev_warn(rdev->dev, "VM size (%d) to small, min is 4MB\n",
+ radeon_vm_size);
+ radeon_vm_size = 4096;
+ }
+
+ /*
+ * Max GPUVM size for Cayman, SI and NI are 40 bits.
+ */
+ if (radeon_vm_size > 1024*1024) {
+ dev_warn(rdev->dev, "VM size (%d) to large, max is 1TB\n",
+ radeon_vm_size);
+ radeon_vm_size = 4096;
+ }
}
/**
@@ -1197,12 +1218,6 @@ int radeon_device_init(struct radeon_device *rdev,
if (r)
return r;
- /* Adjust VM size here.
- * Currently set to 4GB ((1 << 20) 4k pages).
- * Max GPUVM size for cayman and SI is 40 bits.
- */
- rdev->vm_manager.max_pfn = 1 << 20;
-
/* Set asic functions */
r = radeon_asic_init(rdev);
if (r)
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 15447a41..a09426c 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -172,6 +172,7 @@ int radeon_dpm = -1;
int radeon_aspm = -1;
int radeon_runtime_pm = -1;
int radeon_hard_reset = 0;
+int radeon_vm_size = 4096;
MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -239,6 +240,9 @@ module_param_named(runpm, radeon_runtime_pm, int, 0444);
MODULE_PARM_DESC(hard_reset, "PCI config reset (1 = force enable, 0 = disable (default))");
module_param_named(hard_reset, radeon_hard_reset, int, 0444);
+MODULE_PARM_DESC(vm_size, "VM address space size in megabytes (default 4GB)");
+module_param_named(vm_size, radeon_vm_size, int, 0444);
+
static struct pci_device_id pciidlist[] = {
radeon_PCI_IDS
};
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index d3c9161..0b1055e 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -59,7 +59,7 @@
*/
static unsigned radeon_vm_num_pdes(struct radeon_device *rdev)
{
- return rdev->vm_manager.max_pfn >> RADEON_VM_BLOCK_SIZE;
+ return (radeon_vm_size << 8) >> RADEON_VM_BLOCK_SIZE;
}
/**
@@ -433,9 +433,9 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
}
last_pfn = eoffset / RADEON_GPU_PAGE_SIZE;
- if (last_pfn > rdev->vm_manager.max_pfn) {
+ if (last_pfn > (radeon_vm_size << 8)) {
dev_err(rdev->dev, "va above limit (0x%08X > 0x%08X)\n",
- last_pfn, rdev->vm_manager.max_pfn);
+ last_pfn, (radeon_vm_size << 8));
return -EINVAL;
}
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index d64ef91..afa2a9b 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -4076,7 +4076,7 @@ static int si_pcie_gart_enable(struct radeon_device *rdev)
/* empty context1-15 */
/* set vm size, must be a multiple of 4 */
WREG32(VM_CONTEXT1_PAGE_TABLE_START_ADDR, 0);
- WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, rdev->vm_manager.max_pfn);
+ WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, radeon_vm_size << 8);
/* Assign the pt base to something valid for now; the pts used for
* the VMs are determined by the application and setup and assigned
* on the fly in the vm part of radeon_gart.c
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] drm/radeon: make vm_block_size a module parameter
2014-06-02 15:33 [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains Christian König
2014-06-02 15:33 ` [PATCH 2/4] drm/radeon: make VM size a module parameter Christian König
@ 2014-06-02 15:33 ` Christian König
2014-06-02 15:33 ` [PATCH 4/4] drm/radeon: add debugfs file to trigger GPU reset Christian König
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Christian König @ 2014-06-02 15:33 UTC (permalink / raw)
To: alexdeucher; +Cc: dri-devel
From: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/radeon/cik.c | 2 +-
drivers/gpu/drm/radeon/ni.c | 2 +-
drivers/gpu/drm/radeon/radeon.h | 8 ++------
drivers/gpu/drm/radeon/radeon_device.c | 16 ++++++++++++++++
drivers/gpu/drm/radeon/radeon_drv.c | 4 ++++
drivers/gpu/drm/radeon/radeon_vm.c | 20 ++++++++++----------
drivers/gpu/drm/radeon/si.c | 2 +-
7 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index be464d0..cbf9b7f 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -5446,7 +5446,7 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev)
(u32)(rdev->dummy_page.addr >> 12));
WREG32(VM_CONTEXT1_CNTL2, 4);
WREG32(VM_CONTEXT1_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(1) |
- PAGE_TABLE_BLOCK_SIZE(RADEON_VM_BLOCK_SIZE - 9) |
+ PAGE_TABLE_BLOCK_SIZE(radeon_vm_block_size - 9) |
RANGE_PROTECTION_FAULT_ENABLE_INTERRUPT |
RANGE_PROTECTION_FAULT_ENABLE_DEFAULT |
DUMMY_PAGE_PROTECTION_FAULT_ENABLE_INTERRUPT |
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index ff7cbbc..a4de68a 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1269,7 +1269,7 @@ static int cayman_pcie_gart_enable(struct radeon_device *rdev)
(u32)(rdev->dummy_page.addr >> 12));
WREG32(VM_CONTEXT1_CNTL2, 4);
WREG32(VM_CONTEXT1_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(1) |
- PAGE_TABLE_BLOCK_SIZE(RADEON_VM_BLOCK_SIZE - 9) |
+ PAGE_TABLE_BLOCK_SIZE(radeon_vm_block_size - 9) |
RANGE_PROTECTION_FAULT_ENABLE_INTERRUPT |
RANGE_PROTECTION_FAULT_ENABLE_DEFAULT |
DUMMY_PAGE_PROTECTION_FAULT_ENABLE_INTERRUPT |
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 3d8b4fd..0661a77 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -101,6 +101,7 @@ extern int radeon_aspm;
extern int radeon_runtime_pm;
extern int radeon_hard_reset;
extern int radeon_vm_size;
+extern int radeon_vm_block_size;
/*
* Copy from radeon_drv.h so we don't have to include both and have conflicting
@@ -838,13 +839,8 @@ struct radeon_mec {
/* maximum number of VMIDs */
#define RADEON_NUM_VM 16
-/* defines number of bits in page table versus page directory,
- * a page is 4KB so we have 12 bits offset, 9 bits in the page
- * table and the remaining 19 bits are in the page directory */
-#define RADEON_VM_BLOCK_SIZE 9
-
/* number of entries in page table */
-#define RADEON_VM_PTE_COUNT (1 << RADEON_VM_BLOCK_SIZE)
+#define RADEON_VM_PTE_COUNT (1 << radeon_vm_block_size)
/* PTBs (Page Table Blocks) need to be aligned to 32K */
#define RADEON_VM_PTB_ALIGN_SIZE 32768
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 83032a6..847f949 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1073,6 +1073,22 @@ static void radeon_check_arguments(struct radeon_device *rdev)
radeon_vm_size);
radeon_vm_size = 4096;
}
+
+ /* defines number of bits in page table versus page directory,
+ * a page is 4KB so we have 12 bits offset, minimum 9 bits in the
+ * page table and the remaining bits are in the page directory */
+ if (radeon_vm_block_size < 9) {
+ dev_warn(rdev->dev, "VM page table size (%d) to small\n",
+ radeon_vm_block_size);
+ radeon_vm_block_size = 9;
+ }
+
+ if (radeon_vm_block_size > 24 ||
+ radeon_vm_size < (1ull << radeon_vm_block_size)) {
+ dev_warn(rdev->dev, "VM page table size (%d) to large\n",
+ radeon_vm_block_size);
+ radeon_vm_block_size = 9;
+ }
}
/**
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index a09426c..b7a2ec2 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -173,6 +173,7 @@ int radeon_aspm = -1;
int radeon_runtime_pm = -1;
int radeon_hard_reset = 0;
int radeon_vm_size = 4096;
+int radeon_vm_block_size = 9;
MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -243,6 +244,9 @@ module_param_named(hard_reset, radeon_hard_reset, int, 0444);
MODULE_PARM_DESC(vm_size, "VM address space size in megabytes (default 4GB)");
module_param_named(vm_size, radeon_vm_size, int, 0444);
+MODULE_PARM_DESC(vm_block_size, "VM page table size in bits (default 9)");
+module_param_named(vm_block_size, radeon_vm_block_size, int, 0444);
+
static struct pci_device_id pciidlist[] = {
radeon_PCI_IDS
};
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index 0b1055e..fc362be 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -59,7 +59,7 @@
*/
static unsigned radeon_vm_num_pdes(struct radeon_device *rdev)
{
- return (radeon_vm_size << 8) >> RADEON_VM_BLOCK_SIZE;
+ return (radeon_vm_size << 8) >> radeon_vm_block_size;
}
/**
@@ -474,8 +474,10 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
bo_va->valid = false;
list_move(&bo_va->vm_list, head);
- soffset = (soffset / RADEON_GPU_PAGE_SIZE) >> RADEON_VM_BLOCK_SIZE;
- eoffset = (eoffset / RADEON_GPU_PAGE_SIZE) >> RADEON_VM_BLOCK_SIZE;
+ soffset = (soffset / RADEON_GPU_PAGE_SIZE) >> radeon_vm_block_size;
+ eoffset = (eoffset / RADEON_GPU_PAGE_SIZE) >> radeon_vm_block_size;
+
+ BUG_ON(eoffset >= radeon_vm_num_pdes(rdev));
if (eoffset > vm->max_pde_used)
vm->max_pde_used = eoffset;
@@ -583,10 +585,9 @@ static uint32_t radeon_vm_page_flags(uint32_t flags)
int radeon_vm_update_page_directory(struct radeon_device *rdev,
struct radeon_vm *vm)
{
- static const uint32_t incr = RADEON_VM_PTE_COUNT * 8;
-
struct radeon_bo *pd = vm->page_directory;
uint64_t pd_addr = radeon_bo_gpu_offset(pd);
+ uint32_t incr = RADEON_VM_PTE_COUNT * 8;
uint64_t last_pde = ~0, last_pt = ~0;
unsigned count = 0, pt_idx, ndw;
struct radeon_ib ib;
@@ -757,8 +758,7 @@ static void radeon_vm_update_ptes(struct radeon_device *rdev,
uint64_t start, uint64_t end,
uint64_t dst, uint32_t flags)
{
- static const uint64_t mask = RADEON_VM_PTE_COUNT - 1;
-
+ uint64_t mask = RADEON_VM_PTE_COUNT - 1;
uint64_t last_pte = ~0, last_dst = ~0;
unsigned count = 0;
uint64_t addr;
@@ -768,7 +768,7 @@ static void radeon_vm_update_ptes(struct radeon_device *rdev,
/* walk over the address space and update the page tables */
for (addr = start; addr < end; ) {
- uint64_t pt_idx = addr >> RADEON_VM_BLOCK_SIZE;
+ uint64_t pt_idx = addr >> radeon_vm_block_size;
struct radeon_bo *pt = vm->page_tables[pt_idx].bo;
unsigned nptes;
uint64_t pte;
@@ -873,13 +873,13 @@ int radeon_vm_bo_update(struct radeon_device *rdev,
/* padding, etc. */
ndw = 64;
- if (RADEON_VM_BLOCK_SIZE > 11)
+ if (radeon_vm_block_size > 11)
/* reserve space for one header for every 2k dwords */
ndw += (nptes >> 11) * 4;
else
/* reserve space for one header for
every (1 << BLOCK_SIZE) entries */
- ndw += (nptes >> RADEON_VM_BLOCK_SIZE) * 4;
+ ndw += (nptes >> radeon_vm_block_size) * 4;
/* reserve space for pte addresses */
ndw += nptes * 2;
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index afa2a9b..3c8debe 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -4095,7 +4095,7 @@ static int si_pcie_gart_enable(struct radeon_device *rdev)
(u32)(rdev->dummy_page.addr >> 12));
WREG32(VM_CONTEXT1_CNTL2, 4);
WREG32(VM_CONTEXT1_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(1) |
- PAGE_TABLE_BLOCK_SIZE(RADEON_VM_BLOCK_SIZE - 9) |
+ PAGE_TABLE_BLOCK_SIZE(radeon_vm_block_size - 9) |
RANGE_PROTECTION_FAULT_ENABLE_INTERRUPT |
RANGE_PROTECTION_FAULT_ENABLE_DEFAULT |
DUMMY_PAGE_PROTECTION_FAULT_ENABLE_INTERRUPT |
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] drm/radeon: add debugfs file to trigger GPU reset
2014-06-02 15:33 [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains Christian König
2014-06-02 15:33 ` [PATCH 2/4] drm/radeon: make VM size a module parameter Christian König
2014-06-02 15:33 ` [PATCH 3/4] drm/radeon: make vm_block_size " Christian König
@ 2014-06-02 15:33 ` Christian König
2014-06-02 15:52 ` [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains Alex Deucher
2014-06-02 18:51 ` Marek Olšák
4 siblings, 0 replies; 9+ messages in thread
From: Christian König @ 2014-06-02 15:33 UTC (permalink / raw)
To: alexdeucher; +Cc: dri-devel
From: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/radeon/radeon_fence.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index a77b1c1..9137870 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -819,15 +819,35 @@ static int radeon_debugfs_fence_info(struct seq_file *m, void *data)
return 0;
}
+/**
+ * radeon_debugfs_gpu_reset - manually trigger a gpu reset
+ *
+ * Manually trigger a gpu reset at the next fence wait.
+ */
+static int radeon_debugfs_gpu_reset(struct seq_file *m, void *data)
+{
+ struct drm_info_node *node = (struct drm_info_node *) m->private;
+ struct drm_device *dev = node->minor->dev;
+ struct radeon_device *rdev = dev->dev_private;
+
+ down_read(&rdev->exclusive_lock);
+ seq_printf(m, "%d\n", rdev->needs_reset);
+ rdev->needs_reset = true;
+ up_read(&rdev->exclusive_lock);
+
+ return 0;
+}
+
static struct drm_info_list radeon_debugfs_fence_list[] = {
{"radeon_fence_info", &radeon_debugfs_fence_info, 0, NULL},
+ {"radeon_gpu_reset", &radeon_debugfs_gpu_reset, 0, NULL}
};
#endif
int radeon_debugfs_fence_init(struct radeon_device *rdev)
{
#if defined(CONFIG_DEBUG_FS)
- return radeon_debugfs_add_files(rdev, radeon_debugfs_fence_list, 1);
+ return radeon_debugfs_add_files(rdev, radeon_debugfs_fence_list, 2);
#else
return 0;
#endif
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/4] drm/radeon: make VM size a module parameter
2014-06-02 15:33 ` [PATCH 2/4] drm/radeon: make VM size a module parameter Christian König
@ 2014-06-02 15:49 ` Alex Deucher
0 siblings, 0 replies; 9+ messages in thread
From: Alex Deucher @ 2014-06-02 15:49 UTC (permalink / raw)
To: Christian König; +Cc: Maling list - DRI developers
On Mon, Jun 2, 2014 at 11:33 AM, Christian König
<deathsimple@vodafone.de> wrote:
> From: Christian König <christian.koenig@amd.com>
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/radeon/cik.c | 2 +-
> drivers/gpu/drm/radeon/ni.c | 3 ++-
> drivers/gpu/drm/radeon/radeon.h | 2 +-
> drivers/gpu/drm/radeon/radeon_device.c | 27 +++++++++++++++++++++------
> drivers/gpu/drm/radeon/radeon_drv.c | 4 ++++
> drivers/gpu/drm/radeon/radeon_vm.c | 6 +++---
> drivers/gpu/drm/radeon/si.c | 2 +-
> 7 files changed, 33 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index 69a00d6..be464d0 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -5431,7 +5431,7 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev)
> */
> /* set vm size, must be a multiple of 4 */
> WREG32(VM_CONTEXT1_PAGE_TABLE_START_ADDR, 0);
> - WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, rdev->vm_manager.max_pfn);
> + WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, radeon_vm_size << 8);
> for (i = 1; i < 16; i++) {
> if (i < 8)
> WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
> diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
> index 1d3209f..ff7cbbc 100644
> --- a/drivers/gpu/drm/radeon/ni.c
> +++ b/drivers/gpu/drm/radeon/ni.c
> @@ -1258,7 +1258,8 @@ static int cayman_pcie_gart_enable(struct radeon_device *rdev)
> */
> for (i = 1; i < 8; i++) {
> WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR + (i << 2), 0);
> - WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR + (i << 2), rdev->vm_manager.max_pfn);
> + WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR + (i << 2),
> + radeon_vm_size << 8);
> WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
> rdev->gart.table_addr >> 12);
> }
> diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
> index babb7f1..3d8b4fd 100644
> --- a/drivers/gpu/drm/radeon/radeon.h
> +++ b/drivers/gpu/drm/radeon/radeon.h
> @@ -100,6 +100,7 @@ extern int radeon_dpm;
> extern int radeon_aspm;
> extern int radeon_runtime_pm;
> extern int radeon_hard_reset;
> +extern int radeon_vm_size;
>
> /*
> * Copy from radeon_drv.h so we don't have to include both and have conflicting
> @@ -893,7 +894,6 @@ struct radeon_vm {
>
> struct radeon_vm_manager {
> struct radeon_fence *active[RADEON_NUM_VM];
> - uint32_t max_pfn;
> /* number of VMIDs */
> unsigned nvm;
> /* vram base address for page table entry */
> diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
> index 26e1882..83032a6 100644
> --- a/drivers/gpu/drm/radeon/radeon_device.c
> +++ b/drivers/gpu/drm/radeon/radeon_device.c
> @@ -1052,6 +1052,27 @@ static void radeon_check_arguments(struct radeon_device *rdev)
> radeon_agpmode = 0;
> break;
> }
> +
> + if (!radeon_check_pot_argument(radeon_vm_size)) {
> + dev_warn(rdev->dev, "VM size (%d) must be a power of 2\n",
> + radeon_vm_size);
> + radeon_vm_size = 4096;
> + }
> +
> + if (radeon_vm_size < 4) {
> + dev_warn(rdev->dev, "VM size (%d) to small, min is 4MB\n",
> + radeon_vm_size);
> + radeon_vm_size = 4096;
> + }
> +
> + /*
> + * Max GPUVM size for Cayman, SI and NI are 40 bits.
> + */
Typo in the comment. Should say:
Max GPUVM size for Cayman, SI and CI are 40 bits.
> + if (radeon_vm_size > 1024*1024) {
> + dev_warn(rdev->dev, "VM size (%d) to large, max is 1TB\n",
> + radeon_vm_size);
> + radeon_vm_size = 4096;
> + }
> }
>
> /**
> @@ -1197,12 +1218,6 @@ int radeon_device_init(struct radeon_device *rdev,
> if (r)
> return r;
>
> - /* Adjust VM size here.
> - * Currently set to 4GB ((1 << 20) 4k pages).
> - * Max GPUVM size for cayman and SI is 40 bits.
> - */
> - rdev->vm_manager.max_pfn = 1 << 20;
> -
Could reduce the size of the patch by setting keeping max_pfn and
setting it based on radeon_vm_size here. I'd kind of prefer that
stylistically, but I don't have a strong preference.
Alex
> /* Set asic functions */
> r = radeon_asic_init(rdev);
> if (r)
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index 15447a41..a09426c 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -172,6 +172,7 @@ int radeon_dpm = -1;
> int radeon_aspm = -1;
> int radeon_runtime_pm = -1;
> int radeon_hard_reset = 0;
> +int radeon_vm_size = 4096;
>
> MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
> module_param_named(no_wb, radeon_no_wb, int, 0444);
> @@ -239,6 +240,9 @@ module_param_named(runpm, radeon_runtime_pm, int, 0444);
> MODULE_PARM_DESC(hard_reset, "PCI config reset (1 = force enable, 0 = disable (default))");
> module_param_named(hard_reset, radeon_hard_reset, int, 0444);
>
> +MODULE_PARM_DESC(vm_size, "VM address space size in megabytes (default 4GB)");
> +module_param_named(vm_size, radeon_vm_size, int, 0444);
> +
> static struct pci_device_id pciidlist[] = {
> radeon_PCI_IDS
> };
> diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
> index d3c9161..0b1055e 100644
> --- a/drivers/gpu/drm/radeon/radeon_vm.c
> +++ b/drivers/gpu/drm/radeon/radeon_vm.c
> @@ -59,7 +59,7 @@
> */
> static unsigned radeon_vm_num_pdes(struct radeon_device *rdev)
> {
> - return rdev->vm_manager.max_pfn >> RADEON_VM_BLOCK_SIZE;
> + return (radeon_vm_size << 8) >> RADEON_VM_BLOCK_SIZE;
> }
>
> /**
> @@ -433,9 +433,9 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
> }
>
> last_pfn = eoffset / RADEON_GPU_PAGE_SIZE;
> - if (last_pfn > rdev->vm_manager.max_pfn) {
> + if (last_pfn > (radeon_vm_size << 8)) {
> dev_err(rdev->dev, "va above limit (0x%08X > 0x%08X)\n",
> - last_pfn, rdev->vm_manager.max_pfn);
> + last_pfn, (radeon_vm_size << 8));
> return -EINVAL;
> }
>
> diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
> index d64ef91..afa2a9b 100644
> --- a/drivers/gpu/drm/radeon/si.c
> +++ b/drivers/gpu/drm/radeon/si.c
> @@ -4076,7 +4076,7 @@ static int si_pcie_gart_enable(struct radeon_device *rdev)
> /* empty context1-15 */
> /* set vm size, must be a multiple of 4 */
> WREG32(VM_CONTEXT1_PAGE_TABLE_START_ADDR, 0);
> - WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, rdev->vm_manager.max_pfn);
> + WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, radeon_vm_size << 8);
> /* Assign the pt base to something valid for now; the pts used for
> * the VMs are determined by the application and setup and assigned
> * on the fly in the vm part of radeon_gart.c
> --
> 1.9.1
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains
2014-06-02 15:33 [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains Christian König
` (2 preceding siblings ...)
2014-06-02 15:33 ` [PATCH 4/4] drm/radeon: add debugfs file to trigger GPU reset Christian König
@ 2014-06-02 15:52 ` Alex Deucher
2014-06-04 11:00 ` Christian König
2014-06-02 18:51 ` Marek Olšák
4 siblings, 1 reply; 9+ messages in thread
From: Alex Deucher @ 2014-06-02 15:52 UTC (permalink / raw)
To: Christian König; +Cc: Maling list - DRI developers
On Mon, Jun 2, 2014 at 11:33 AM, Christian König
<deathsimple@vodafone.de> wrote:
> From: Christian König <christian.koenig@amd.com>
>
> And also domain to prefered_domains. That matches better
> what those values represent.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> Cc: Marek Olšák <maraeo@gmail.com>
A couple of comments on 2/4, but other than that, the series is:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/radeon/radeon.h | 4 ++--
> drivers/gpu/drm/radeon/radeon_cs.c | 8 ++++----
> drivers/gpu/drm/radeon/radeon_object.c | 9 +++++----
> drivers/gpu/drm/radeon/radeon_vm.c | 8 ++++----
> 4 files changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
> index 7501ba31..babb7f1 100644
> --- a/drivers/gpu/drm/radeon/radeon.h
> +++ b/drivers/gpu/drm/radeon/radeon.h
> @@ -997,8 +997,8 @@ struct radeon_cs_reloc {
> struct radeon_bo *robj;
> struct ttm_validate_buffer tv;
> uint64_t gpu_offset;
> - unsigned domain;
> - unsigned alt_domain;
> + unsigned prefered_domains;
> + unsigned allowed_domains;
> uint32_t tiling_flags;
> uint32_t handle;
> };
> diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
> index 41ecf8a..71a1434 100644
> --- a/drivers/gpu/drm/radeon/radeon_cs.c
> +++ b/drivers/gpu/drm/radeon/radeon_cs.c
> @@ -140,10 +140,10 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
> if (p->ring == R600_RING_TYPE_UVD_INDEX &&
> (i == 0 || drm_pci_device_is_agp(p->rdev->ddev))) {
> /* TODO: is this still needed for NI+ ? */
> - p->relocs[i].domain =
> + p->relocs[i].prefered_domains =
> RADEON_GEM_DOMAIN_VRAM;
>
> - p->relocs[i].alt_domain =
> + p->relocs[i].allowed_domains =
> RADEON_GEM_DOMAIN_VRAM;
>
> /* prioritize this over any other relocation */
> @@ -158,10 +158,10 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
> return -EINVAL;
> }
>
> - p->relocs[i].domain = domain;
> + p->relocs[i].prefered_domains = domain;
> if (domain == RADEON_GEM_DOMAIN_VRAM)
> domain |= RADEON_GEM_DOMAIN_GTT;
> - p->relocs[i].alt_domain = domain;
> + p->relocs[i].allowed_domains = domain;
> }
>
> p->relocs[i].tv.bo = &p->relocs[i].robj->tbo;
> diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
> index 2918087..6c717b2 100644
> --- a/drivers/gpu/drm/radeon/radeon_object.c
> +++ b/drivers/gpu/drm/radeon/radeon_object.c
> @@ -446,7 +446,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
> list_for_each_entry(lobj, head, tv.head) {
> bo = lobj->robj;
> if (!bo->pin_count) {
> - u32 domain = lobj->domain;
> + u32 domain = lobj->prefered_domains;
> u32 current_domain =
> radeon_mem_type_to_domain(bo->tbo.mem.mem_type);
>
> @@ -458,7 +458,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
> * into account. We don't want to disallow buffer moves
> * completely.
> */
> - if ((lobj->alt_domain & current_domain) != 0 &&
> + if ((lobj->allowed_domains & current_domain) != 0 &&
> (domain & current_domain) == 0 && /* will be moved */
> bytes_moved > bytes_moved_threshold) {
> /* don't move it */
> @@ -476,8 +476,9 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
> initial_bytes_moved;
>
> if (unlikely(r)) {
> - if (r != -ERESTARTSYS && domain != lobj->alt_domain) {
> - domain = lobj->alt_domain;
> + if (r != -ERESTARTSYS &&
> + domain != lobj->allowed_domains) {
> + domain = lobj->allowed_domains;
> goto retry;
> }
> ttm_eu_backoff_reservation(ticket, head);
> diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
> index a72e9c8..d3c9161 100644
> --- a/drivers/gpu/drm/radeon/radeon_vm.c
> +++ b/drivers/gpu/drm/radeon/radeon_vm.c
> @@ -140,8 +140,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
> /* add the vm page table to the list */
> list[0].gobj = NULL;
> list[0].robj = vm->page_directory;
> - list[0].domain = RADEON_GEM_DOMAIN_VRAM;
> - list[0].alt_domain = RADEON_GEM_DOMAIN_VRAM;
> + list[0].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
> + list[0].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
> list[0].tv.bo = &vm->page_directory->tbo;
> list[0].tiling_flags = 0;
> list[0].handle = 0;
> @@ -153,8 +153,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
>
> list[idx].gobj = NULL;
> list[idx].robj = vm->page_tables[i].bo;
> - list[idx].domain = RADEON_GEM_DOMAIN_VRAM;
> - list[idx].alt_domain = RADEON_GEM_DOMAIN_VRAM;
> + list[idx].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
> + list[idx].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
> list[idx].tv.bo = &list[idx].robj->tbo;
> list[idx].tiling_flags = 0;
> list[idx].handle = 0;
> --
> 1.9.1
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains
2014-06-02 15:33 [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains Christian König
` (3 preceding siblings ...)
2014-06-02 15:52 ` [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains Alex Deucher
@ 2014-06-02 18:51 ` Marek Olšák
4 siblings, 0 replies; 9+ messages in thread
From: Marek Olšák @ 2014-06-02 18:51 UTC (permalink / raw)
To: Christian König; +Cc: dri-devel
Thanks. This patch is:
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Marek
On Mon, Jun 2, 2014 at 5:33 PM, Christian König <deathsimple@vodafone.de> wrote:
> From: Christian König <christian.koenig@amd.com>
>
> And also domain to prefered_domains. That matches better
> what those values represent.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> Cc: Marek Olšák <maraeo@gmail.com>
> ---
> drivers/gpu/drm/radeon/radeon.h | 4 ++--
> drivers/gpu/drm/radeon/radeon_cs.c | 8 ++++----
> drivers/gpu/drm/radeon/radeon_object.c | 9 +++++----
> drivers/gpu/drm/radeon/radeon_vm.c | 8 ++++----
> 4 files changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
> index 7501ba31..babb7f1 100644
> --- a/drivers/gpu/drm/radeon/radeon.h
> +++ b/drivers/gpu/drm/radeon/radeon.h
> @@ -997,8 +997,8 @@ struct radeon_cs_reloc {
> struct radeon_bo *robj;
> struct ttm_validate_buffer tv;
> uint64_t gpu_offset;
> - unsigned domain;
> - unsigned alt_domain;
> + unsigned prefered_domains;
> + unsigned allowed_domains;
> uint32_t tiling_flags;
> uint32_t handle;
> };
> diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
> index 41ecf8a..71a1434 100644
> --- a/drivers/gpu/drm/radeon/radeon_cs.c
> +++ b/drivers/gpu/drm/radeon/radeon_cs.c
> @@ -140,10 +140,10 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
> if (p->ring == R600_RING_TYPE_UVD_INDEX &&
> (i == 0 || drm_pci_device_is_agp(p->rdev->ddev))) {
> /* TODO: is this still needed for NI+ ? */
> - p->relocs[i].domain =
> + p->relocs[i].prefered_domains =
> RADEON_GEM_DOMAIN_VRAM;
>
> - p->relocs[i].alt_domain =
> + p->relocs[i].allowed_domains =
> RADEON_GEM_DOMAIN_VRAM;
>
> /* prioritize this over any other relocation */
> @@ -158,10 +158,10 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
> return -EINVAL;
> }
>
> - p->relocs[i].domain = domain;
> + p->relocs[i].prefered_domains = domain;
> if (domain == RADEON_GEM_DOMAIN_VRAM)
> domain |= RADEON_GEM_DOMAIN_GTT;
> - p->relocs[i].alt_domain = domain;
> + p->relocs[i].allowed_domains = domain;
> }
>
> p->relocs[i].tv.bo = &p->relocs[i].robj->tbo;
> diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
> index 2918087..6c717b2 100644
> --- a/drivers/gpu/drm/radeon/radeon_object.c
> +++ b/drivers/gpu/drm/radeon/radeon_object.c
> @@ -446,7 +446,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
> list_for_each_entry(lobj, head, tv.head) {
> bo = lobj->robj;
> if (!bo->pin_count) {
> - u32 domain = lobj->domain;
> + u32 domain = lobj->prefered_domains;
> u32 current_domain =
> radeon_mem_type_to_domain(bo->tbo.mem.mem_type);
>
> @@ -458,7 +458,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
> * into account. We don't want to disallow buffer moves
> * completely.
> */
> - if ((lobj->alt_domain & current_domain) != 0 &&
> + if ((lobj->allowed_domains & current_domain) != 0 &&
> (domain & current_domain) == 0 && /* will be moved */
> bytes_moved > bytes_moved_threshold) {
> /* don't move it */
> @@ -476,8 +476,9 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
> initial_bytes_moved;
>
> if (unlikely(r)) {
> - if (r != -ERESTARTSYS && domain != lobj->alt_domain) {
> - domain = lobj->alt_domain;
> + if (r != -ERESTARTSYS &&
> + domain != lobj->allowed_domains) {
> + domain = lobj->allowed_domains;
> goto retry;
> }
> ttm_eu_backoff_reservation(ticket, head);
> diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
> index a72e9c8..d3c9161 100644
> --- a/drivers/gpu/drm/radeon/radeon_vm.c
> +++ b/drivers/gpu/drm/radeon/radeon_vm.c
> @@ -140,8 +140,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
> /* add the vm page table to the list */
> list[0].gobj = NULL;
> list[0].robj = vm->page_directory;
> - list[0].domain = RADEON_GEM_DOMAIN_VRAM;
> - list[0].alt_domain = RADEON_GEM_DOMAIN_VRAM;
> + list[0].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
> + list[0].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
> list[0].tv.bo = &vm->page_directory->tbo;
> list[0].tiling_flags = 0;
> list[0].handle = 0;
> @@ -153,8 +153,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
>
> list[idx].gobj = NULL;
> list[idx].robj = vm->page_tables[i].bo;
> - list[idx].domain = RADEON_GEM_DOMAIN_VRAM;
> - list[idx].alt_domain = RADEON_GEM_DOMAIN_VRAM;
> + list[idx].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
> + list[idx].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
> list[idx].tv.bo = &list[idx].robj->tbo;
> list[idx].tiling_flags = 0;
> list[idx].handle = 0;
> --
> 1.9.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains
2014-06-02 15:52 ` [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains Alex Deucher
@ 2014-06-04 11:00 ` Christian König
2014-06-04 13:24 ` Alex Deucher
0 siblings, 1 reply; 9+ messages in thread
From: Christian König @ 2014-06-04 11:00 UTC (permalink / raw)
To: Alex Deucher; +Cc: Maling list - DRI developers
Am 02.06.2014 17:52, schrieb Alex Deucher:
> On Mon, Jun 2, 2014 at 11:33 AM, Christian König
> <deathsimple@vodafone.de> wrote:
>> From: Christian König <christian.koenig@amd.com>
>>
>> And also domain to prefered_domains. That matches better
>> what those values represent.
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> Cc: Marek Olšák <maraeo@gmail.com>
> A couple of comments on 2/4, but other than that, the series is:
>
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
It looks like your comments on #4 never made it to me, could you resend
them?
Thanks,
Christian.
>
>> ---
>> drivers/gpu/drm/radeon/radeon.h | 4 ++--
>> drivers/gpu/drm/radeon/radeon_cs.c | 8 ++++----
>> drivers/gpu/drm/radeon/radeon_object.c | 9 +++++----
>> drivers/gpu/drm/radeon/radeon_vm.c | 8 ++++----
>> 4 files changed, 15 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
>> index 7501ba31..babb7f1 100644
>> --- a/drivers/gpu/drm/radeon/radeon.h
>> +++ b/drivers/gpu/drm/radeon/radeon.h
>> @@ -997,8 +997,8 @@ struct radeon_cs_reloc {
>> struct radeon_bo *robj;
>> struct ttm_validate_buffer tv;
>> uint64_t gpu_offset;
>> - unsigned domain;
>> - unsigned alt_domain;
>> + unsigned prefered_domains;
>> + unsigned allowed_domains;
>> uint32_t tiling_flags;
>> uint32_t handle;
>> };
>> diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
>> index 41ecf8a..71a1434 100644
>> --- a/drivers/gpu/drm/radeon/radeon_cs.c
>> +++ b/drivers/gpu/drm/radeon/radeon_cs.c
>> @@ -140,10 +140,10 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
>> if (p->ring == R600_RING_TYPE_UVD_INDEX &&
>> (i == 0 || drm_pci_device_is_agp(p->rdev->ddev))) {
>> /* TODO: is this still needed for NI+ ? */
>> - p->relocs[i].domain =
>> + p->relocs[i].prefered_domains =
>> RADEON_GEM_DOMAIN_VRAM;
>>
>> - p->relocs[i].alt_domain =
>> + p->relocs[i].allowed_domains =
>> RADEON_GEM_DOMAIN_VRAM;
>>
>> /* prioritize this over any other relocation */
>> @@ -158,10 +158,10 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
>> return -EINVAL;
>> }
>>
>> - p->relocs[i].domain = domain;
>> + p->relocs[i].prefered_domains = domain;
>> if (domain == RADEON_GEM_DOMAIN_VRAM)
>> domain |= RADEON_GEM_DOMAIN_GTT;
>> - p->relocs[i].alt_domain = domain;
>> + p->relocs[i].allowed_domains = domain;
>> }
>>
>> p->relocs[i].tv.bo = &p->relocs[i].robj->tbo;
>> diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
>> index 2918087..6c717b2 100644
>> --- a/drivers/gpu/drm/radeon/radeon_object.c
>> +++ b/drivers/gpu/drm/radeon/radeon_object.c
>> @@ -446,7 +446,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
>> list_for_each_entry(lobj, head, tv.head) {
>> bo = lobj->robj;
>> if (!bo->pin_count) {
>> - u32 domain = lobj->domain;
>> + u32 domain = lobj->prefered_domains;
>> u32 current_domain =
>> radeon_mem_type_to_domain(bo->tbo.mem.mem_type);
>>
>> @@ -458,7 +458,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
>> * into account. We don't want to disallow buffer moves
>> * completely.
>> */
>> - if ((lobj->alt_domain & current_domain) != 0 &&
>> + if ((lobj->allowed_domains & current_domain) != 0 &&
>> (domain & current_domain) == 0 && /* will be moved */
>> bytes_moved > bytes_moved_threshold) {
>> /* don't move it */
>> @@ -476,8 +476,9 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
>> initial_bytes_moved;
>>
>> if (unlikely(r)) {
>> - if (r != -ERESTARTSYS && domain != lobj->alt_domain) {
>> - domain = lobj->alt_domain;
>> + if (r != -ERESTARTSYS &&
>> + domain != lobj->allowed_domains) {
>> + domain = lobj->allowed_domains;
>> goto retry;
>> }
>> ttm_eu_backoff_reservation(ticket, head);
>> diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
>> index a72e9c8..d3c9161 100644
>> --- a/drivers/gpu/drm/radeon/radeon_vm.c
>> +++ b/drivers/gpu/drm/radeon/radeon_vm.c
>> @@ -140,8 +140,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
>> /* add the vm page table to the list */
>> list[0].gobj = NULL;
>> list[0].robj = vm->page_directory;
>> - list[0].domain = RADEON_GEM_DOMAIN_VRAM;
>> - list[0].alt_domain = RADEON_GEM_DOMAIN_VRAM;
>> + list[0].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
>> + list[0].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
>> list[0].tv.bo = &vm->page_directory->tbo;
>> list[0].tiling_flags = 0;
>> list[0].handle = 0;
>> @@ -153,8 +153,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
>>
>> list[idx].gobj = NULL;
>> list[idx].robj = vm->page_tables[i].bo;
>> - list[idx].domain = RADEON_GEM_DOMAIN_VRAM;
>> - list[idx].alt_domain = RADEON_GEM_DOMAIN_VRAM;
>> + list[idx].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
>> + list[idx].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
>> list[idx].tv.bo = &list[idx].robj->tbo;
>> list[idx].tiling_flags = 0;
>> list[idx].handle = 0;
>> --
>> 1.9.1
>>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains
2014-06-04 11:00 ` Christian König
@ 2014-06-04 13:24 ` Alex Deucher
0 siblings, 0 replies; 9+ messages in thread
From: Alex Deucher @ 2014-06-04 13:24 UTC (permalink / raw)
To: Christian König; +Cc: Maling list - DRI developers
On Wed, Jun 4, 2014 at 7:00 AM, Christian König <deathsimple@vodafone.de> wrote:
> Am 02.06.2014 17:52, schrieb Alex Deucher:
>
>> On Mon, Jun 2, 2014 at 11:33 AM, Christian König
>> <deathsimple@vodafone.de> wrote:
>>>
>>> From: Christian König <christian.koenig@amd.com>
>>>
>>> And also domain to prefered_domains. That matches better
>>> what those values represent.
>>>
>>> Signed-off-by: Christian König <christian.koenig@amd.com>
>>> Cc: Marek Olšák <maraeo@gmail.com>
>>
>> A couple of comments on 2/4, but other than that, the series is:
>>
>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>
>
> It looks like your comments on #4 never made it to me, could you resend
> them?
>
My comments were only on patch 2 of 4, not patch 4 itself.
Alex
> Thanks,
> Christian.
>
>
>>
>>> ---
>>> drivers/gpu/drm/radeon/radeon.h | 4 ++--
>>> drivers/gpu/drm/radeon/radeon_cs.c | 8 ++++----
>>> drivers/gpu/drm/radeon/radeon_object.c | 9 +++++----
>>> drivers/gpu/drm/radeon/radeon_vm.c | 8 ++++----
>>> 4 files changed, 15 insertions(+), 14 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/radeon/radeon.h
>>> b/drivers/gpu/drm/radeon/radeon.h
>>> index 7501ba31..babb7f1 100644
>>> --- a/drivers/gpu/drm/radeon/radeon.h
>>> +++ b/drivers/gpu/drm/radeon/radeon.h
>>> @@ -997,8 +997,8 @@ struct radeon_cs_reloc {
>>> struct radeon_bo *robj;
>>> struct ttm_validate_buffer tv;
>>> uint64_t gpu_offset;
>>> - unsigned domain;
>>> - unsigned alt_domain;
>>> + unsigned prefered_domains;
>>> + unsigned allowed_domains;
>>> uint32_t tiling_flags;
>>> uint32_t handle;
>>> };
>>> diff --git a/drivers/gpu/drm/radeon/radeon_cs.c
>>> b/drivers/gpu/drm/radeon/radeon_cs.c
>>> index 41ecf8a..71a1434 100644
>>> --- a/drivers/gpu/drm/radeon/radeon_cs.c
>>> +++ b/drivers/gpu/drm/radeon/radeon_cs.c
>>> @@ -140,10 +140,10 @@ static int radeon_cs_parser_relocs(struct
>>> radeon_cs_parser *p)
>>> if (p->ring == R600_RING_TYPE_UVD_INDEX &&
>>> (i == 0 || drm_pci_device_is_agp(p->rdev->ddev))) {
>>> /* TODO: is this still needed for NI+ ? */
>>> - p->relocs[i].domain =
>>> + p->relocs[i].prefered_domains =
>>> RADEON_GEM_DOMAIN_VRAM;
>>>
>>> - p->relocs[i].alt_domain =
>>> + p->relocs[i].allowed_domains =
>>> RADEON_GEM_DOMAIN_VRAM;
>>>
>>> /* prioritize this over any other relocation */
>>> @@ -158,10 +158,10 @@ static int radeon_cs_parser_relocs(struct
>>> radeon_cs_parser *p)
>>> return -EINVAL;
>>> }
>>>
>>> - p->relocs[i].domain = domain;
>>> + p->relocs[i].prefered_domains = domain;
>>> if (domain == RADEON_GEM_DOMAIN_VRAM)
>>> domain |= RADEON_GEM_DOMAIN_GTT;
>>> - p->relocs[i].alt_domain = domain;
>>> + p->relocs[i].allowed_domains = domain;
>>> }
>>>
>>> p->relocs[i].tv.bo = &p->relocs[i].robj->tbo;
>>> diff --git a/drivers/gpu/drm/radeon/radeon_object.c
>>> b/drivers/gpu/drm/radeon/radeon_object.c
>>> index 2918087..6c717b2 100644
>>> --- a/drivers/gpu/drm/radeon/radeon_object.c
>>> +++ b/drivers/gpu/drm/radeon/radeon_object.c
>>> @@ -446,7 +446,7 @@ int radeon_bo_list_validate(struct radeon_device
>>> *rdev,
>>> list_for_each_entry(lobj, head, tv.head) {
>>> bo = lobj->robj;
>>> if (!bo->pin_count) {
>>> - u32 domain = lobj->domain;
>>> + u32 domain = lobj->prefered_domains;
>>> u32 current_domain =
>>>
>>> radeon_mem_type_to_domain(bo->tbo.mem.mem_type);
>>>
>>> @@ -458,7 +458,7 @@ int radeon_bo_list_validate(struct radeon_device
>>> *rdev,
>>> * into account. We don't want to disallow
>>> buffer moves
>>> * completely.
>>> */
>>> - if ((lobj->alt_domain & current_domain) != 0 &&
>>> + if ((lobj->allowed_domains & current_domain) != 0
>>> &&
>>> (domain & current_domain) == 0 && /* will be
>>> moved */
>>> bytes_moved > bytes_moved_threshold) {
>>> /* don't move it */
>>> @@ -476,8 +476,9 @@ int radeon_bo_list_validate(struct radeon_device
>>> *rdev,
>>> initial_bytes_moved;
>>>
>>> if (unlikely(r)) {
>>> - if (r != -ERESTARTSYS && domain !=
>>> lobj->alt_domain) {
>>> - domain = lobj->alt_domain;
>>> + if (r != -ERESTARTSYS &&
>>> + domain != lobj->allowed_domains) {
>>> + domain = lobj->allowed_domains;
>>> goto retry;
>>> }
>>> ttm_eu_backoff_reservation(ticket,
>>> head);
>>> diff --git a/drivers/gpu/drm/radeon/radeon_vm.c
>>> b/drivers/gpu/drm/radeon/radeon_vm.c
>>> index a72e9c8..d3c9161 100644
>>> --- a/drivers/gpu/drm/radeon/radeon_vm.c
>>> +++ b/drivers/gpu/drm/radeon/radeon_vm.c
>>> @@ -140,8 +140,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct
>>> radeon_device *rdev,
>>> /* add the vm page table to the list */
>>> list[0].gobj = NULL;
>>> list[0].robj = vm->page_directory;
>>> - list[0].domain = RADEON_GEM_DOMAIN_VRAM;
>>> - list[0].alt_domain = RADEON_GEM_DOMAIN_VRAM;
>>> + list[0].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
>>> + list[0].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
>>> list[0].tv.bo = &vm->page_directory->tbo;
>>> list[0].tiling_flags = 0;
>>> list[0].handle = 0;
>>> @@ -153,8 +153,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct
>>> radeon_device *rdev,
>>>
>>> list[idx].gobj = NULL;
>>> list[idx].robj = vm->page_tables[i].bo;
>>> - list[idx].domain = RADEON_GEM_DOMAIN_VRAM;
>>> - list[idx].alt_domain = RADEON_GEM_DOMAIN_VRAM;
>>> + list[idx].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
>>> + list[idx].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
>>> list[idx].tv.bo = &list[idx].robj->tbo;
>>> list[idx].tiling_flags = 0;
>>> list[idx].handle = 0;
>>> --
>>> 1.9.1
>>>
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-06-04 13:24 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-02 15:33 [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains Christian König
2014-06-02 15:33 ` [PATCH 2/4] drm/radeon: make VM size a module parameter Christian König
2014-06-02 15:49 ` Alex Deucher
2014-06-02 15:33 ` [PATCH 3/4] drm/radeon: make vm_block_size " Christian König
2014-06-02 15:33 ` [PATCH 4/4] drm/radeon: add debugfs file to trigger GPU reset Christian König
2014-06-02 15:52 ` [PATCH 1/4] drm/radeon: rename alt_domain to allowed_domains Alex Deucher
2014-06-04 11:00 ` Christian König
2014-06-04 13:24 ` Alex Deucher
2014-06-02 18:51 ` Marek Olšák
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.