Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9f87f64 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: use a 64bit interval tree for VM management v2 



This only makes a difference for 32-bit systems. The idea is to have a
fixed virtual address space size with 4-level page tables and to
minimize differences between 32 and 64-bit systems.

v2: Update commit message.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ca7f65c7

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+5 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <linux/wait.h>

#include <linux/list.h>

#include <linux/kref.h>

#include <linux/interval_tree.h>

#include <linux/rbtree.h>

#include <linux/hashtable.h>

#include <linux/dma-fence.h>
@@ -379,7 +379,10 @@ struct amdgpu_bo_list_entry { 


struct amdgpu_bo_va_mapping {

	struct list_head		list;

	struct interval_tree_node	it;

	struct rb_node			rb;

	uint64_t			start;

	uint64_t			last;

	uint64_t			__subtree_last;

	uint64_t			offset;

	uint64_t			flags;

};

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+6 −6
Original line number Diff line number Diff line
@@ -949,7 +949,7 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev, 
			}



			if ((chunk_ib->va_start + chunk_ib->ib_bytes) >

			    (m->it.last + 1) * AMDGPU_GPU_PAGE_SIZE) {

			    (m->last + 1) * AMDGPU_GPU_PAGE_SIZE) {

				DRM_ERROR("IB va_start+ib_bytes is invalid\n");

				return -EINVAL;

			}
@@ -960,7 +960,7 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev, 
				return r;

			}



			offset = ((uint64_t)m->it.start) * AMDGPU_GPU_PAGE_SIZE;

			offset = m->start * AMDGPU_GPU_PAGE_SIZE;

			kptr += chunk_ib->va_start - offset;



			r =  amdgpu_ib_get(adev, vm, chunk_ib->ib_bytes, ib);
@@ -1388,8 +1388,8 @@ amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser, 
			continue;



		list_for_each_entry(mapping, &lobj->bo_va->valids, list) {

			if (mapping->it.start > addr ||

			    addr > mapping->it.last)

			if (mapping->start > addr ||

			    addr > mapping->last)

				continue;



			*bo = lobj->bo_va->bo;
@@ -1397,8 +1397,8 @@ amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser, 
		}



		list_for_each_entry(mapping, &lobj->bo_va->invalids, list) {

			if (mapping->it.start > addr ||

			    addr > mapping->it.last)

			if (mapping->start > addr ||

			    addr > mapping->last)

				continue;



			*bo = lobj->bo_va->bo;

drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/firmware.h>

#include <linux/module.h>

#include <linux/mmu_notifier.h>

#include <linux/interval_tree.h>

#include <drm/drmP.h>

#include <drm/drm.h>

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h

+6 −6
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ TRACE_EVENT(amdgpu_vm_bo_map, 


	    TP_fast_assign(

			   __entry->bo = bo_va ? bo_va->bo : NULL;

			   __entry->start = mapping->it.start;

			   __entry->last = mapping->it.last;

			   __entry->start = mapping->start;

			   __entry->last = mapping->last;

			   __entry->offset = mapping->offset;

			   __entry->flags = mapping->flags;

			   ),
@@ -250,8 +250,8 @@ TRACE_EVENT(amdgpu_vm_bo_unmap, 


	    TP_fast_assign(

			   __entry->bo = bo_va->bo;

			   __entry->start = mapping->it.start;

			   __entry->last = mapping->it.last;

			   __entry->start = mapping->start;

			   __entry->last = mapping->last;

			   __entry->offset = mapping->offset;

			   __entry->flags = mapping->flags;

			   ),
@@ -270,8 +270,8 @@ DECLARE_EVENT_CLASS(amdgpu_vm_mapping, 
			     ),



	    TP_fast_assign(

			   __entry->soffset = mapping->it.start;

			   __entry->eoffset = mapping->it.last + 1;

			   __entry->soffset = mapping->start;

			   __entry->eoffset = mapping->last + 1;

			   __entry->flags = mapping->flags;

			   ),

	    TP_printk("soffs=%010llx, eoffs=%010llx, flags=%08x",

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

+2 −2
Original line number Diff line number Diff line
@@ -741,10 +741,10 @@ static int amdgpu_uvd_cs_pass2(struct amdgpu_uvd_cs_ctx *ctx) 


	start = amdgpu_bo_gpu_offset(bo);



	end = (mapping->it.last + 1 - mapping->it.start);

	end = (mapping->last + 1 - mapping->start);

	end = end * AMDGPU_GPU_PAGE_SIZE + start;



	addr -= ((uint64_t)mapping->it.start) * AMDGPU_GPU_PAGE_SIZE;

	addr -= mapping->start * AMDGPU_GPU_PAGE_SIZE;

	start += addr;



	amdgpu_set_ib_value(ctx->parser, ctx->ib_idx, ctx->data0,