Commit 14c90746 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.10-2020-10-29' of... 

Merge tag 'amd-drm-fixes-5.10-2020-10-29' of git://people.freedesktop.org/~agd5f/linux

 into drm-fixes

amd-drm-fixes-5.10-2020-10-29:

amdgpu:
- Add new navi1x PCI ID
- GPUVM reserved area fixes
- Misc display fixes
- Fix bad interactions between display code and CONFIG_KGDB
- Fixes for SMU manual fan control and i2c

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201029061549.4133-1-alexander.deucher@amd.com
parents 3650b228 65d437b8

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

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

	{0x1002, 0x731A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10},

	{0x1002, 0x731B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10},

	{0x1002, 0x731E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10},

	{0x1002, 0x731F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10},

	/* Navi14 */

	{0x1002, 0x7340, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14},

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

+10 −0
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 
	struct ww_acquire_ctx ticket;

	struct list_head list, duplicates;

	uint64_t va_flags;

	uint64_t vm_size;

	int r = 0;



	if (args->va_address < AMDGPU_VA_RESERVED_SIZE) {
@@ -616,6 +617,15 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 


	args->va_address &= AMDGPU_GMC_HOLE_MASK;



	vm_size = adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE;

	vm_size -= AMDGPU_VA_RESERVED_SIZE;

	if (args->va_address + args->map_size > vm_size) {

		dev_dbg(&dev->pdev->dev,

			"va_address 0x%llx is in top reserved area 0x%llx\n",

			args->va_address + args->map_size, vm_size);

		return -EINVAL;

	}



	if ((args->flags & ~valid_flags) && (args->flags & ~prt_flags)) {

		dev_dbg(&dev->pdev->dev, "invalid flags combination 0x%08X\n",

			args->flags);

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

+2 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ struct amdgpu_bo_list_entry; 
#define AMDGPU_MMHUB_0				1

#define AMDGPU_MMHUB_1				2



/* hardcode that limit for now */

#define AMDGPU_VA_RESERVED_SIZE			(1ULL << 20)

/* Reserve 2MB at top/bottom of address space for kernel use */

#define AMDGPU_VA_RESERVED_SIZE			(2ULL << 20)



/* max vmids dedicated for process */

#define AMDGPU_VM_MAX_RESERVED_VMID	1

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

+12 −2
Original line number Diff line number Diff line
@@ -455,6 +455,14 @@ void nv_set_virt_ops(struct amdgpu_device *adev) 
	adev->virt.ops = &xgpu_nv_virt_ops;

}



static bool nv_is_blockchain_sku(struct pci_dev *pdev)

{

	if (pdev->device == 0x731E &&

	    (pdev->revision == 0xC6 || pdev->revision == 0xC7))

		return true;

	return false;

}



int nv_set_ip_blocks(struct amdgpu_device *adev)

{

	int r;
@@ -483,7 +491,8 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) 
		if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))

			amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);

#if defined(CONFIG_DRM_AMD_DC)

		else if (amdgpu_device_has_dc_support(adev))

		else if (amdgpu_device_has_dc_support(adev) &&

			 !nv_is_blockchain_sku(adev->pdev))

			amdgpu_device_ip_block_add(adev, &dm_ip_block);

#endif

		amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);
@@ -491,6 +500,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) 
		if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT &&

		    !amdgpu_sriov_vf(adev))

			amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);

		if (!nv_is_blockchain_sku(adev->pdev))

			amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block);

		amdgpu_device_ip_block_add(adev, &jpeg_v2_0_ip_block);

		if (adev->enable_mes)

drivers/gpu/drm/amd/display/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ config DRM_AMD_DC_SI 
config DEBUG_KERNEL_DC

	bool "Enable kgdb break in DC"

	depends on DRM_AMD_DC

	depends on KGDB

	help

	  Choose this option if you want to hit kdgb_break in assert.

CRA Git | Maintained and supported by SUSTech CRA and CCSE