Commit 0a131b69 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.18-2022-02-18' of... 

Merge tag 'amd-drm-next-5.18-2022-02-18' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-5.18-2022-02-18:

amdgpu:
- kerneldoc fixes
- Expose IP discovery data via sysfs
- RAS rework
- SRIOV fixes
- Display FP fix
- RDNA2 SMU fixes
- Display DSC fixes
- Cyan Skillfish update
- GC 10.3.7 updates
- SDMA 5.2.7 updates
- DCN 3.1.6 updates
- Fix ASPM handling
- GC 10.3.6 updates

amdkfd:
- SPDX header cleanups
- SDMA queue handling fixes
- Misc fixes

radeon:
- iMac backlight fix

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

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

+5 −0
Original line number Diff line number Diff line
@@ -771,6 +771,8 @@ struct amd_powerplay { 
	const struct amd_pm_funcs *pp_funcs;

};



struct ip_discovery_top;



/* polaris10 kickers */

#define ASICID_IS_P20(did, rid)		(((did == 0x67DF) && \

					 ((rid == 0xE3) || \
@@ -1096,6 +1098,8 @@ struct amdgpu_device { 
	bool				ram_is_direct_mapped;



	struct list_head                ras_list;



	struct ip_discovery_top         *ip_top;

};



static inline struct amdgpu_device *drm_to_adev(struct drm_device *ddev)
@@ -1292,6 +1296,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);

int amdgpu_device_pci_reset(struct amdgpu_device *adev);

bool amdgpu_device_need_post(struct amdgpu_device *adev);

bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev);



void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes,

				  u64 num_vis_bytes);

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

+2 −2
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ static void get_wave_count(struct amdgpu_device *adev, int queue_idx, 
 * process whose pasid is provided as a parameter. The process could have ZERO

 * or more queues running and submitting waves to compute units.

 *

 * @kgd: Handle of device from which to get number of waves in flight

 * @adev: Handle of device from which to get number of waves in flight

 * @pasid: Identifies the process for which this query call is invoked

 * @pasid_wave_cnt: Output parameter updated with number of waves in flight that

 * belong to process with given pasid
@@ -724,7 +724,7 @@ static void get_wave_count(struct amdgpu_device *adev, int queue_idx, 
 *

 * Note: It's possible that the device has too many queues (oversubscription)

 * in which case a VMID could be remapped to a different PASID. This could lead

 * to an iaccurate wave count. Following is a high-level sequence:

 * to an inaccurate wave count. Following is a high-level sequence:

 *    Time T1: vmid = getVmid(); vmid is associated with Pasid P1

 *    Time T2: passId = getPasId(vmid); vmid is associated with Pasid P2

 * In the sequence above wave count obtained from time T1 will be incorrectly

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

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static size_t amdgpu_amdkfd_acc_size(uint64_t size) 
}



/**

 * @amdgpu_amdkfd_reserve_mem_limit() - Decrease available memory by size

 * amdgpu_amdkfd_reserve_mem_limit() - Decrease available memory by size

 * of buffer including any reserved for control structures

 *

 * @adev: Device to which allocated BO belongs to

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

+2 −1
Original line number Diff line number Diff line
@@ -613,6 +613,7 @@ int amdgpu_ctx_ioctl(struct drm_device *dev, void *data, 
		if (args->in.flags)

			return -EINVAL;

		r = amdgpu_ctx_stable_pstate(adev, fpriv, id, false, &stable_pstate);

		if (!r)

			args->out.pstate.flags = stable_pstate;

		break;

	case AMDGPU_CTX_OP_SET_STABLE_PSTATE:

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

+4 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf, 
		return -ENOMEM;



	/* version, increment each time something is added */

	config[no_regs++] = 3;

	config[no_regs++] = 4;

	config[no_regs++] = adev->gfx.config.max_shader_engines;

	config[no_regs++] = adev->gfx.config.max_tile_pipes;

	config[no_regs++] = adev->gfx.config.max_cu_per_sh;
@@ -768,6 +768,9 @@ static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf, 
	config[no_regs++] = adev->pdev->subsystem_device;

	config[no_regs++] = adev->pdev->subsystem_vendor;



	/* rev==4 APU flag */

	config[no_regs++] = adev->flags & AMD_IS_APU ? 1 : 0;



	while (size && (*pos < no_regs * 4)) {

		uint32_t value;