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

Merge tag 'amd-drm-fixes-6.1-2022-10-12' of... 

Merge tag 'amd-drm-fixes-6.1-2022-10-12' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-fixes-6.1-2022-10-12:

amdgpu:
- DC mutex fix
- DC SubVP fixes
- DCN 3.2.x fixes
- DCN 3.1.x fixes
- SDMA 6.x fixes
- Enable DPIA for 3.1.4
- VRR fixes
- VRAM BO swapping fix
- Revert dirty fb helper change
- SR-IOV suspend/resume fixes
- Work around GCC array bounds check fail warning
- UMC 8.10 fixes
- Misc fixes and cleanups

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221012162650.8810-1-alexander.deucher@amd.com
parents e55978a4 0811b9e4

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

+3 −3
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev) 
		return;



	adev->kfd.dev = kgd2kfd_probe(adev, vf);



	if (adev->kfd.dev)

		amdgpu_amdkfd_total_mem_size += adev->gmc.real_vram_size;

}



/**
@@ -201,6 +198,8 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 
		adev->kfd.init_complete = kgd2kfd_device_init(adev->kfd.dev,

						adev_to_drm(adev), &gpu_resources);



		amdgpu_amdkfd_total_mem_size += adev->gmc.real_vram_size;



		INIT_WORK(&adev->kfd.reset_work, amdgpu_amdkfd_reset_work);

	}

}
@@ -210,6 +209,7 @@ void amdgpu_amdkfd_device_fini_sw(struct amdgpu_device *adev) 
	if (adev->kfd.dev) {

		kgd2kfd_device_exit(adev->kfd.dev);

		adev->kfd.dev = NULL;

		amdgpu_amdkfd_total_mem_size -= adev->gmc.real_vram_size;

	}

}

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

+2 −12
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ 
#include <linux/pci.h>

#include <linux/pm_runtime.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_damage_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_edid.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_fb_helper.h>
@@ -500,12 +498,6 @@ static const struct drm_framebuffer_funcs amdgpu_fb_funcs = { 
	.create_handle = drm_gem_fb_create_handle,

};



static const struct drm_framebuffer_funcs amdgpu_fb_funcs_atomic = {

	.destroy = drm_gem_fb_destroy,

	.create_handle = drm_gem_fb_create_handle,

	.dirty = drm_atomic_helper_dirtyfb,

};



uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev,

					  uint64_t bo_flags)

{
@@ -1108,10 +1100,8 @@ static int amdgpu_display_gem_fb_verify_and_init(struct drm_device *dev, 
	if (ret)

		goto err;



	if (drm_drv_uses_atomic_modeset(dev))

		ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs_atomic);

	else

	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);



	if (ret)

		goto err;

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

+4 −1
Original line number Diff line number Diff line
@@ -688,13 +688,16 @@ int amdgpu_bo_create_vm(struct amdgpu_device *adev, 
	 * num of amdgpu_vm_pt entries.

	 */

	BUG_ON(bp->bo_ptr_size < sizeof(struct amdgpu_bo_vm));

	bp->destroy = &amdgpu_bo_vm_destroy;

	r = amdgpu_bo_create(adev, bp, &bo_ptr);

	if (r)

		return r;



	*vmbo_ptr = to_amdgpu_bo_vm(bo_ptr);

	INIT_LIST_HEAD(&(*vmbo_ptr)->shadow_list);

	/* Set destroy callback to amdgpu_bo_vm_destroy after vmbo->shadow_list

	 * is initialized.

	 */

	bo_ptr->tbo.destroy = &amdgpu_bo_vm_destroy;

	return r;

}

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

+4 −4
Original line number Diff line number Diff line
@@ -2878,8 +2878,8 @@ static int amdgpu_bad_page_notifier(struct notifier_block *nb, 
		kcalloc(adev->umc.max_ras_err_cnt_per_query,

			sizeof(struct eeprom_table_record), GFP_KERNEL);

	if (!err_data.err_addr) {

		dev_warn(adev->dev, "Failed to alloc memory for "

				"umc error address record in mca notifier!\n");

		dev_warn(adev->dev,

			"Failed to alloc memory for umc error record in mca notifier!\n");

		return NOTIFY_DONE;

	}
@@ -2889,7 +2889,7 @@ static int amdgpu_bad_page_notifier(struct notifier_block *nb, 
	if (adev->umc.ras &&

	    adev->umc.ras->convert_ras_error_address)

		adev->umc.ras->convert_ras_error_address(adev,

			&err_data, 0, ch_inst, umc_inst, m->addr);

			&err_data, m->addr, ch_inst, umc_inst);



	if (amdgpu_bad_page_threshold != 0) {

		amdgpu_ras_add_bad_pages(adev, err_data.err_addr,

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

+26 −3
Original line number Diff line number Diff line
@@ -222,8 +222,10 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev, 
		adev->sdma.instance[instance].fw->data;

	version_major = le16_to_cpu(header->header_version_major);



	if ((duplicate && instance) || (!duplicate && version_major > 1))

		return -EINVAL;

	if ((duplicate && instance) || (!duplicate && version_major > 1)) {

		err = -EINVAL;

		goto out;

	}



	err = amdgpu_sdma_init_inst_ctx(&adev->sdma.instance[instance]);

	if (err)
@@ -272,7 +274,7 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev, 
				ALIGN(le32_to_cpu(sdma_hdr->ctl_ucode_size_bytes), PAGE_SIZE);

			break;

		default:

			return -EINVAL;

			err = -EINVAL;

		}

	}
@@ -283,3 +285,24 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev, 
	}

	return err;

}



void amdgpu_sdma_unset_buffer_funcs_helper(struct amdgpu_device *adev)

{

	struct amdgpu_ring *sdma;

	int i;



	for (i = 0; i < adev->sdma.num_instances; i++) {

		if (adev->sdma.has_page_queue) {

			sdma = &adev->sdma.instance[i].page;

			if (adev->mman.buffer_funcs_ring == sdma) {

				amdgpu_ttm_set_buffer_funcs_status(adev, false);

				break;

			}

		}

		sdma = &adev->sdma.instance[i].ring;

		if (adev->mman.buffer_funcs_ring == sdma) {

			amdgpu_ttm_set_buffer_funcs_status(adev, false);

			break;

		}

	}

}