Commit 786cb0a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2021-07-16' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Regular rc2 fixes though a bit more than usual at rc2 stage, people
  must have been testing early or else some fixes from last week got a
  bit laggy.

  There is one larger change in the amd fixes to amalgamate some power
  management code on the newer chips with the code from the older chips,
  it should only affects chips where support was introduced in rc1 and
  it should make future fixes easier to maintain probably a good idea to
  merge it now.

  Otherwise it's mostly fixes across the board.

  dma-buf:
   - Fix fence leak in sync_file_merge() error code

  drm/panel:
   - nt35510: Don't fail on DSI reads

  fbdev:
   - Avoid use-after-free by not deleting current video mode

  ttm:
   - Avoid NULL-ptr deref in ttm_range_man_fini()

  vmwgfx:
   - Fix a merge commit

  qxl:
   - fix a TTM regression

  amdgpu:
   - SR-IOV fixes
   - RAS fixes
   - eDP fixes
   - SMU13 code unification to facilitate fixes in the future
   - Add new renoir DID
   - Yellow Carp fixes
   - Beige Goby fixes
   - Revert a bunch of TLB fixes that caused regressions
   - Revert an LTTPR display regression

  amdkfd
   - Fix VRAM access regression
   - SVM fixes

  i915:
   - Fix -EDEADLK handling regression
   - Drop the page table optimisation"

* tag 'drm-fixes-2021-07-16' of git://anongit.freedesktop.org/drm/drm: (29 commits)
  drm/amdgpu: add another Renoir DID
  drm/ttm: add a check against null pointer dereference
  drm/i915/gtt: drop the page table optimisation
  drm/i915/gt: Fix -EDEADLK handling regression
  drm/amd/pm: Add waiting for response of mode-reset message for yellow carp
  Revert "drm/amdkfd: Add heavy-weight TLB flush after unmapping"
  Revert "drm/amdgpu: Add table_freed parameter to amdgpu_vm_bo_update"
  Revert "drm/amdkfd: Make TLB flush conditional on mapping"
  Revert "drm/amdgpu: Fix warning of Function parameter or member not described"
  Revert "drm/amdkfd: Add memory sync before TLB flush on unmap"
  drm/amd/pm: Fix BACO state setting for Beige_Goby
  drm/amdgpu: Restore msix after FLR
  drm/amdkfd: Allow CPU access for all VRAM BOs
  drm/amdgpu/display - only update eDP's backlight level when necessary
  drm/amdkfd: handle fault counters on invalid address
  drm/amdgpu: Correct the irq numbers for virtual crtc
  drm/amd/display: update header file name
  drm/amd/pm: drop smu_v13_0_1.c|h files for yellow carp
  drm/amd/display: remove faulty assert
  Revert "drm/amd/display: Always write repeater mode regardless of LTTPR"
  ...
parents 6e442d06 876d98e5

drivers/dma-buf/sync_file.c

+7 −6
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, 
					 struct sync_file *b)

{

	struct sync_file *sync_file;

	struct dma_fence **fences, **nfences, **a_fences, **b_fences;

	int i, i_a, i_b, num_fences, a_num_fences, b_num_fences;

	struct dma_fence **fences = NULL, **nfences, **a_fences, **b_fences;

	int i = 0, i_a, i_b, num_fences, a_num_fences, b_num_fences;



	sync_file = sync_file_alloc();

	if (!sync_file)
@@ -236,7 +236,7 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, 
	 * If a sync_file can only be created with sync_file_merge

	 * and sync_file_create, this is a reasonable assumption.

	 */

	for (i = i_a = i_b = 0; i_a < a_num_fences && i_b < b_num_fences; ) {

	for (i_a = i_b = 0; i_a < a_num_fences && i_b < b_num_fences; ) {

		struct dma_fence *pt_a = a_fences[i_a];

		struct dma_fence *pt_b = b_fences[i_b];
@@ -277,15 +277,16 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, 
		fences = nfences;

	}



	if (sync_file_set_fence(sync_file, fences, i) < 0) {

		kfree(fences);

	if (sync_file_set_fence(sync_file, fences, i) < 0)

		goto err;

	}



	strlcpy(sync_file->user_name, name, sizeof(sync_file->user_name));

	return sync_file;



err:

	while (i)

		dma_fence_put(fences[--i]);

	kfree(fences);

	fput(sync_file->file);

	return NULL;

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

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( 
		struct kgd_dev *kgd, struct kgd_mem *mem, void *drm_priv,

		uint64_t *size);

int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(

		struct kgd_dev *kgd, struct kgd_mem *mem, void *drm_priv, bool *table_freed);

		struct kgd_dev *kgd, struct kgd_mem *mem, void *drm_priv);

int amdgpu_amdkfd_gpuvm_unmap_memory_from_gpu(

		struct kgd_dev *kgd, struct kgd_mem *mem, void *drm_priv);

int amdgpu_amdkfd_gpuvm_sync_memory(

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

+9 −13
Original line number Diff line number Diff line
@@ -1057,8 +1057,7 @@ static void unmap_bo_from_gpuvm(struct kgd_mem *mem, 


static int update_gpuvm_pte(struct kgd_mem *mem,

			    struct kfd_mem_attachment *entry,

			    struct amdgpu_sync *sync,

			    bool *table_freed)

			    struct amdgpu_sync *sync)

{

	struct amdgpu_bo_va *bo_va = entry->bo_va;

	struct amdgpu_device *adev = entry->adev;
@@ -1069,7 +1068,7 @@ static int update_gpuvm_pte(struct kgd_mem *mem, 
		return ret;



	/* Update the page tables  */

	ret = amdgpu_vm_bo_update(adev, bo_va, false, table_freed);

	ret = amdgpu_vm_bo_update(adev, bo_va, false);

	if (ret) {

		pr_err("amdgpu_vm_bo_update failed\n");

		return ret;
@@ -1081,8 +1080,7 @@ static int update_gpuvm_pte(struct kgd_mem *mem, 
static int map_bo_to_gpuvm(struct kgd_mem *mem,

			   struct kfd_mem_attachment *entry,

			   struct amdgpu_sync *sync,

			   bool no_update_pte,

			   bool *table_freed)

			   bool no_update_pte)

{

	int ret;
@@ -1099,7 +1097,7 @@ static int map_bo_to_gpuvm(struct kgd_mem *mem, 
	if (no_update_pte)

		return 0;



	ret = update_gpuvm_pte(mem, entry, sync, table_freed);

	ret = update_gpuvm_pte(mem, entry, sync);

	if (ret) {

		pr_err("update_gpuvm_pte() failed\n");

		goto update_gpuvm_pte_failed;
@@ -1393,8 +1391,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
		domain = alloc_domain = AMDGPU_GEM_DOMAIN_VRAM;

		alloc_flags = AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE;

		alloc_flags |= (flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC) ?

			AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED :

			AMDGPU_GEM_CREATE_NO_CPU_ACCESS;

			AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED : 0;

	} else if (flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT) {

		domain = alloc_domain = AMDGPU_GEM_DOMAIN_GTT;

		alloc_flags = 0;
@@ -1597,8 +1594,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( 
}



int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(

		struct kgd_dev *kgd, struct kgd_mem *mem,

		void *drm_priv, bool *table_freed)

		struct kgd_dev *kgd, struct kgd_mem *mem, void *drm_priv)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

	struct amdgpu_vm *avm = drm_priv_to_vm(drm_priv);
@@ -1686,7 +1682,7 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu( 
			 entry->va, entry->va + bo_size, entry);



		ret = map_bo_to_gpuvm(mem, entry, ctx.sync,

				      is_invalid_userptr, table_freed);

				      is_invalid_userptr);

		if (ret) {

			pr_err("Failed to map bo to gpuvm\n");

			goto out_unreserve;
@@ -2136,7 +2132,7 @@ static int validate_invalid_user_pages(struct amdkfd_process_info *process_info) 
				continue;



			kfd_mem_dmaunmap_attachment(mem, attachment);

			ret = update_gpuvm_pte(mem, attachment, &sync, NULL);

			ret = update_gpuvm_pte(mem, attachment, &sync);

			if (ret) {

				pr_err("%s: update PTE failed\n", __func__);

				/* make sure this gets validated again */
@@ -2342,7 +2338,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef) 
				continue;



			kfd_mem_dmaunmap_attachment(mem, attachment);

			ret = update_gpuvm_pte(mem, attachment, &sync_obj, NULL);

			ret = update_gpuvm_pte(mem, attachment, &sync_obj);

			if (ret) {

				pr_debug("Memory eviction: update PTE failed. Try again\n");

				goto validate_map_fail;

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

+3 −3
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
	if (r)

		return r;



	r = amdgpu_vm_bo_update(adev, fpriv->prt_va, false, NULL);

	r = amdgpu_vm_bo_update(adev, fpriv->prt_va, false);

	if (r)

		return r;
@@ -792,7 +792,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
	if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {

		bo_va = fpriv->csa_va;

		BUG_ON(!bo_va);

		r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);

		r = amdgpu_vm_bo_update(adev, bo_va, false);

		if (r)

			return r;
@@ -811,7 +811,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
		if (bo_va == NULL)

			continue;



		r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);

		r = amdgpu_vm_bo_update(adev, bo_va, false);

		if (r)

			return r;

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

+1 −0
Original line number Diff line number Diff line
@@ -1168,6 +1168,7 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x734F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14},



	/* Renoir */

	{0x1002, 0x15E7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},

	{0x1002, 0x1636, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},

	{0x1002, 0x1638, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},

	{0x1002, 0x164C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},