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

Commit bd3c0094 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux into drm-next 

Last few updates for 4.16:
- Misc fixes for amdgpu
- Enable swapout for reserved BOs during allocation for ttm
- Misc cleanups for ttm

* 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux: (24 commits)
  drm/amdgpu: Correct the IB size of bo update mapping.
  drm/ttm: enable swapout for reserved BOs during allocation
  drm/ttm: add new function to check if bo is allowable to evict or swapout
  drm/ttm: use an operation ctx for ttm_tt_bind
  drm/ttm: use an operation ctx for ttm_tt_populate in ttm_bo_driver (v2)
  drm/ttm: use an operation ctx for ttm_mem_global_alloc_page
  drm/ttm: use an operation ctx for ttm_mem_global_alloc
  drm/ttm: call ttm_bo_swapout directly when ttm shrink
  drm/vmwgfx: remove the default io_mem_pfn set
  drm/virtio: remove the default io_mem_pfn set
  drm/radeon: remove the default io_mem_pfn set
  drm/qxl: remove the default io_mem_pfn set
  drm/nouveau: remove the default io_mem_pfn set
  drm/mgag200: remove the default io_mem_pfn set
  drm/cirrus: remove the default io_mem_pfn set
  drm/bochs: remove the default io_mem_pfn set
  drm/ast: remove the default io_mem_pfn set
  drm/ttm: add ttm_bo_io_mem_pfn to check io_mem_pfn
  drm/amdgpu: fix VM faults with per VM BOs
  drm/ttm: drop the spin in delayed delete if the trylock doesn't work
  ...
parents b0caa133 104bd2ca

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \

	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \

	amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \

	amdgpu_queue_mgr.o amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o

	amdgpu_queue_mgr.o amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o \

	amdgpu_ids.o



# add asic specific block

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \

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

+3 −3
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ struct amdgpu_gart_funcs { 
	/* get the pde for a given mc addr */

	void (*get_vm_pde)(struct amdgpu_device *adev, int level,

			   u64 *dst, u64 *flags);

	uint32_t (*get_invalidate_req)(unsigned int vm_id);

	uint32_t (*get_invalidate_req)(unsigned int vmid);

};



/* provided by the ih block */
@@ -1125,7 +1125,7 @@ struct amdgpu_job { 
	void			*owner;

	uint64_t		fence_ctx; /* the fence_context this job uses */

	bool                    vm_needs_flush;

	unsigned		vm_id;

	unsigned		vmid;

	uint64_t		vm_pd_addr;

	uint32_t		gds_base, gds_size;

	uint32_t		gws_base, gws_size;
@@ -1850,7 +1850,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#define amdgpu_ring_get_rptr(r) (r)->funcs->get_rptr((r))

#define amdgpu_ring_get_wptr(r) (r)->funcs->get_wptr((r))

#define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r))

#define amdgpu_ring_emit_ib(r, ib, vm_id, c) (r)->funcs->emit_ib((r), (ib), (vm_id), (c))

#define amdgpu_ring_emit_ib(r, ib, vmid, c) (r)->funcs->emit_ib((r), (ib), (vmid), (c))

#define amdgpu_ring_emit_pipeline_sync(r) (r)->funcs->emit_pipeline_sync((r))

#define amdgpu_ring_emit_vm_flush(r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr))

#define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags))

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

+2 −2
Original line number Diff line number Diff line
@@ -176,8 +176,8 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.get_local_mem_info = get_local_mem_info,

	.get_gpu_clock_counter = get_gpu_clock_counter,

	.get_max_engine_clock_in_mhz = get_max_engine_clock_in_mhz,

	.alloc_pasid = amdgpu_vm_alloc_pasid,

	.free_pasid = amdgpu_vm_free_pasid,

	.alloc_pasid = amdgpu_pasid_alloc,

	.free_pasid = amdgpu_pasid_free,

	.program_sh_mem_settings = kgd_program_sh_mem_settings,

	.set_pasid_vmid_mapping = kgd_set_pasid_vmid_mapping,

	.init_pipeline = kgd_init_pipeline,

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

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.get_local_mem_info = get_local_mem_info,

	.get_gpu_clock_counter = get_gpu_clock_counter,

	.get_max_engine_clock_in_mhz = get_max_engine_clock_in_mhz,

	.alloc_pasid = amdgpu_vm_alloc_pasid,

	.free_pasid = amdgpu_vm_free_pasid,

	.alloc_pasid = amdgpu_pasid_alloc,

	.free_pasid = amdgpu_pasid_free,

	.program_sh_mem_settings = kgd_program_sh_mem_settings,

	.set_pasid_vmid_mapping = kgd_set_pasid_vmid_mapping,

	.init_pipeline = kgd_init_pipeline,

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

+2 −0
Original line number Diff line number Diff line
@@ -801,6 +801,8 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
				else

					strcpy(fw_name, "amdgpu/vega10_smc.bin");

				break;

			case CHIP_CARRIZO:

			case CHIP_STONEY:

			case CHIP_RAVEN:

				adev->pm.fw_version = info->version;

				return 0;