Commit e61b2ad3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2021-09-24' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Quiet week this week, just some i915 and amd fixes, just getting ready
  for my all nighter maintainer summit!

  Summary:

  i915:
   - Fix ADL-P memory bandwidth parameters
   - Fix memory corruption due to a double free
   - Fix memory leak in DMC firmware handling

  amdgpu:
   - Update MAINTAINERS entry for powerplay
   - Fix empty macros
   - SI DPM fix

  amdkfd:
   - SVM fixes
   - DMA mapping fix"

* tag 'drm-fixes-2021-09-24' of git://anongit.freedesktop.org/drm/drm:
  drm/amdkfd: fix svm_migrate_fini warning
  drm/amdkfd: handle svm migrate init error
  drm/amd/pm: Update intermediate power state for SI
  drm/amdkfd: fix dma mapping leaking warning
  drm/amdkfd: SVM map to gpus check vma boundary
  MAINTAINERS: fix up entry for AMD Powerplay
  drm/amd/display: fix empty debug macros
  drm/i915: Free all DMC payloads
  drm/i915: Move __i915_gem_free_object to ttm_bo_destroy
  drm/i915: Update memory bandwidth parameters
parents f9e36107 ef88d7a8

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -977,12 +977,12 @@ L: platform-driver-x86@vger.kernel.org 
S:	Maintained

F:	drivers/platform/x86/amd-pmc.*









AMD POWERPLAY









AMD POWERPLAY AND SWSMU









M:	Evan Quan <evan.quan@amd.com>









L:	amd-gfx@lists.freedesktop.org









S:	Supported









T:	git https://gitlab.freedesktop.org/agd5f/linux.git









F:	drivers/gpu/drm/amd/pm/powerplay/









F:	drivers/gpu/drm/amd/pm/

















AMD PTDMA DRIVER









M:	Sanjay R Mehta <sanju.mehta@amd.com>


































drivers/gpu/drm/amd/amdkfd/kfd_device.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -971,7 +971,6 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,







void kgd2kfd_device_exit(struct kfd_dev *kfd)









{









	if (kfd->init_complete) {









		svm_migrate_fini((struct amdgpu_device *)kfd->kgd);









		device_queue_manager_uninit(kfd->dqm);









		kfd_interrupt_exit(kfd);









		kfd_topology_remove_device(kfd);


































drivers/gpu/drm/amd/amdkfd/kfd_migrate.c



+7
−9






























Original line number
Diff line number
Diff line







@@ -891,9 +891,16 @@ int svm_migrate_init(struct amdgpu_device *adev)







	pgmap->ops = &svm_migrate_pgmap_ops;









	pgmap->owner = SVM_ADEV_PGMAP_OWNER(adev);









	pgmap->flags = MIGRATE_VMA_SELECT_DEVICE_PRIVATE;



















	/* Device manager releases device-specific resources, memory region and









	 * pgmap when driver disconnects from device.









	 */









	r = devm_memremap_pages(adev->dev, pgmap);









	if (IS_ERR(r)) {









		pr_err("failed to register HMM device memory\n");



















		/* Disable SVM support capability */









		pgmap->type = 0;









		devm_release_mem_region(adev->dev, res->start,









					res->end - res->start + 1);









		return PTR_ERR(r);










@@ -908,12 +915,3 @@ int svm_migrate_init(struct amdgpu_device *adev)

















	return 0;









}


















void svm_migrate_fini(struct amdgpu_device *adev)









{









	struct dev_pagemap *pgmap = &adev->kfd.dev->pgmap;



















	devm_memunmap_pages(adev->dev, pgmap);









	devm_release_mem_region(adev->dev, pgmap->range.start,









				pgmap->range.end - pgmap->range.start + 1);









}
























drivers/gpu/drm/amd/amdkfd/kfd_migrate.h



+0
−5






























Original line number
Diff line number
Diff line







@@ -47,7 +47,6 @@ unsigned long







svm_migrate_addr_to_pfn(struct amdgpu_device *adev, unsigned long addr);



















int svm_migrate_init(struct amdgpu_device *adev);









void svm_migrate_fini(struct amdgpu_device *adev);



















#else




















@@ -55,10 +54,6 @@ static inline int svm_migrate_init(struct amdgpu_device *adev)







{









	return 0;









}









static inline void svm_migrate_fini(struct amdgpu_device *adev)









{









	/* empty */









}



















#endif /* IS_ENABLED(CONFIG_HSA_AMD_SVM) */












































drivers/gpu/drm/amd/amdkfd/kfd_svm.c



+19
−5






























Original line number
Diff line number
Diff line







@@ -118,6 +118,13 @@ static void svm_range_remove_notifier(struct svm_range *prange)







		mmu_interval_notifier_remove(&prange->notifier);









}



















static bool









svm_is_valid_dma_mapping_addr(struct device *dev, dma_addr_t dma_addr)









{









	return dma_addr && !dma_mapping_error(dev, dma_addr) &&









	       !(dma_addr & SVM_RANGE_VRAM_DOMAIN);









}



















static int









svm_range_dma_map_dev(struct amdgpu_device *adev, struct svm_range *prange,









		      unsigned long offset, unsigned long npages,










@@ -139,8 +146,7 @@ svm_range_dma_map_dev(struct amdgpu_device *adev, struct svm_range *prange,

















	addr += offset;









	for (i = 0; i < npages; i++) {









		if (WARN_ONCE(addr[i] && !dma_mapping_error(dev, addr[i]),









			      "leaking dma mapping\n"))









		if (svm_is_valid_dma_mapping_addr(dev, addr[i]))









			dma_unmap_page(dev, addr[i], PAGE_SIZE, dir);



















		page = hmm_pfn_to_page(hmm_pfns[i]);










@@ -209,7 +215,7 @@ void svm_range_dma_unmap(struct device *dev, dma_addr_t *dma_addr,







		return;



















	for (i = offset; i < offset + npages; i++) {









		if (!dma_addr[i] || dma_mapping_error(dev, dma_addr[i]))









		if (!svm_is_valid_dma_mapping_addr(dev, dma_addr[i]))









			continue;









		pr_debug("dma unmapping 0x%llx\n", dma_addr[i] >> PAGE_SHIFT);









		dma_unmap_page(dev, dma_addr[i], PAGE_SIZE, dir);










@@ -1165,7 +1171,7 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm,







	unsigned long last_start;









	int last_domain;









	int r = 0;









	int64_t i;









	int64_t i, j;



















	last_start = prange->start + offset;




















@@ -1178,7 +1184,11 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm,







	for (i = offset; i < offset + npages; i++) {









		last_domain = dma_addr[i] & SVM_RANGE_VRAM_DOMAIN;









		dma_addr[i] &= ~SVM_RANGE_VRAM_DOMAIN;









		if ((prange->start + i) < prange->last &&



















		/* Collect all pages in the same address range and memory domain









		 * that can be mapped with a single call to update mapping.









		 */









		if (i < offset + npages - 1 &&









		    last_domain == (dma_addr[i + 1] & SVM_RANGE_VRAM_DOMAIN))









			continue;




















@@ -1201,6 +1211,10 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm,







						NULL, dma_addr,









						&vm->last_update,









						&table_freed);



















		for (j = last_start - prange->start; j <= i; j++)









			dma_addr[j] |= last_domain;



















		if (r) {









			pr_debug("failed %d to map to gpu 0x%lx\n", r, prange->start);









			goto out;