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

Merge tag 'amd-drm-next-6.6-2023-08-11' of https://gitlab.freedesktop.org/agd5f/linux into drm-next 



amdgpu:
- SDMA 6.1.0 support
- SMU 13.x fixes
- PSP 13.x fixes
- HDP 6.1 support
- SMUIO 14.0 support
- IH 6.1 support
- Coding style cleanups
- Misc display fixes
- Initial Freesync panel replay support
- RAS fixes
- SDMA 5.2 MGCG updates
- SR-IOV fixes
- DCN3+ gamma fix
- Revert zpos properly until IGT regression is fixed
- NBIO 7.9 fixes
- Use TTM to manage the doorbell BAR
- Async flip fix
- DPIA tracing support
- DCN 3.x TMDS HDMI fixes
- FRU fixes

amdkfd:
- Coding style cleanups
- SVM fixes
- Trap handler fixes
- Convert older APUs to use dGPU path like newer APUs
- Drop IOMMUv2 path as it is no longer used

radeon:
- Coding style cleanups

drm buddy:
- Fix debugging output

UAPI:
- A new memory pool was added to amdgpu_drm.h since we converted doorbell BAR management to use TTM,
  but userspace is blocked from allocating from it at this point, so kind of not really anything new
  here per se

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

# -----BEGIN PGP SIGNATURE-----
#
# iHUEABYKAB0WIQQgO5Idg2tXNTSZAr293/aFa7yZ2AUCZNahZwAKCRC93/aFa7yZ
# 2KNjAP0UV2vJZjrze7OQI/YoI+40UlGjS81nKGlMIN3eR8nzvAD/c9McLJViL82R
# idEAK7tsr/MaCKoPAlED7CkUZiHNlQw=
# =4w7I
# -----END PGP SIGNATURE-----
# gpg: Signature made Sat 12 Aug 2023 07:00:23 AEST
# gpg:                using EDDSA key 203B921D836B5735349902BDBDDFF6856BBC99D8
# gpg: Can't check signature: No public key
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230811211554.7804-1-alexander.deucher@amd.com
parents 73c98bf2 6be2ad4f

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -129,7 +129,8 @@ amdgpu-y += \ 
	vega10_ih.o \

	vega20_ih.o \

	navi10_ih.o \

	ih_v6_0.o

	ih_v6_0.o \

	ih_v6_1.o



# add PSP block

amdgpu-y += \

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

+1 −0
Original line number Diff line number Diff line
@@ -1294,6 +1294,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_sg_display_supported(struct amdgpu_device *adev);

bool amdgpu_device_pcie_dynamic_switching_supported(void);

bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev);

bool amdgpu_device_aspm_support_quirk(void);

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

+0 −10
Original line number Diff line number Diff line
@@ -226,16 +226,6 @@ void amdgpu_amdkfd_suspend(struct amdgpu_device *adev, bool run_pm) 
		kgd2kfd_suspend(adev->kfd.dev, run_pm);

}



int amdgpu_amdkfd_resume_iommu(struct amdgpu_device *adev)

{

	int r = 0;



	if (adev->kfd.dev)

		r = kgd2kfd_resume_iommu(adev->kfd.dev);



	return r;

}



int amdgpu_amdkfd_resume(struct amdgpu_device *adev, bool run_pm)

{

	int r = 0;

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

+0 −7
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ int amdgpu_amdkfd_init(void); 
void amdgpu_amdkfd_fini(void);



void amdgpu_amdkfd_suspend(struct amdgpu_device *adev, bool run_pm);

int amdgpu_amdkfd_resume_iommu(struct amdgpu_device *adev);

int amdgpu_amdkfd_resume(struct amdgpu_device *adev, bool run_pm);

void amdgpu_amdkfd_interrupt(struct amdgpu_device *adev,

			const void *ih_ring_entry);
@@ -399,7 +398,6 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
			 const struct kgd2kfd_shared_resources *gpu_resources);

void kgd2kfd_device_exit(struct kfd_dev *kfd);

void kgd2kfd_suspend(struct kfd_dev *kfd, bool run_pm);

int kgd2kfd_resume_iommu(struct kfd_dev *kfd);

int kgd2kfd_resume(struct kfd_dev *kfd, bool run_pm);

int kgd2kfd_pre_reset(struct kfd_dev *kfd);

int kgd2kfd_post_reset(struct kfd_dev *kfd);
@@ -439,11 +437,6 @@ static inline void kgd2kfd_suspend(struct kfd_dev *kfd, bool run_pm) 
{

}



static int __maybe_unused kgd2kfd_resume_iommu(struct kfd_dev *kfd)

{

	return 0;

}



static inline int kgd2kfd_resume(struct kfd_dev *kfd, bool run_pm)

{

	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -1776,7 +1776,7 @@ static ssize_t amdgpu_atombios_get_vbios_version(struct device *dev, 
	struct amdgpu_device *adev = drm_to_adev(ddev);

	struct atom_context *ctx = adev->mode_info.atom_context;



	return sysfs_emit(buf, "%s\n", ctx->vbios_pn);

	return sysfs_emit(buf, "%s\n", ctx->vbios_ver_str);

}



static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version,