Commit 4eaf02db authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.19-2022-04-22' of... 

Merge tag 'amd-drm-next-5.19-2022-04-22' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-5.19-2022-04-22:

amdgpu:
- SMU message documentation update
- Misc code cleanups
- Documenation updates
- PSP TA updates
- Runtime PM regression fix
- SR-IOV header cleanup
- Misc fixes

amdkfd:
- TLB flush fixes
- GWS fixes
- CRIU GWS support

radeon:
- Misc code cleanups

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

Documentation/gpu/amdgpu/amdgpu-glossary.rst

+13 −0
Original line number Diff line number Diff line
@@ -8,12 +8,19 @@ we have a dedicated glossary for Display Core at 


.. glossary::



    active_cu_number

      The number of CUs that are active on the system.  The number of active

      CUs may be less than SE * SH * CU depending on the board configuration.



    CP

      Command Processor



    CPLIB

      Content Protection Library



    CU

      Compute Unit



    DFS

      Digital Frequency Synthesizer
@@ -74,6 +81,12 @@ we have a dedicated glossary for Display Core at 
    SDMA

      System DMA



    SE

      Shader Engine



    SH

      SHader array



    SMU

      System Management Unit

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -16448,6 +16448,7 @@ S: Supported 
T:	git https://gitlab.freedesktop.org/agd5f/linux.git

B:	https://gitlab.freedesktop.org/drm/amd/-/issues

C:	irc://irc.oftc.net/radeon

F:	Documentation/gpu/amdgpu/

F:	drivers/gpu/drm/amd/

F:	drivers/gpu/drm/radeon/

F:	include/uapi/drm/amdgpu_drm.h

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \

	amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \

	amdgpu_fw_attestation.o amdgpu_securedisplay.o \

	amdgpu_eeprom.o amdgpu_mca.o

	amdgpu_eeprom.o amdgpu_mca.o amdgpu_psp_ta.o



amdgpu-$(CONFIG_PROC_FS) += amdgpu_fdinfo.o

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

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "amdgpu_umr.h"



#include "amdgpu_reset.h"

#include "amdgpu_psp_ta.h"



#if defined(CONFIG_DEBUG_FS)
@@ -1767,6 +1768,7 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) 
		DRM_ERROR("registering register debugfs failed (%d).\n", r);



	amdgpu_debugfs_firmware_init(adev);

	amdgpu_ta_if_debugfs_init(adev);



#if defined(CONFIG_DRM_AMD_DC)

	if (amdgpu_device_has_dc_support(adev))

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

+1 −1
Original line number Diff line number Diff line
@@ -3700,7 +3700,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	/* enable PCIE atomic ops */

	if (amdgpu_sriov_vf(adev))

		adev->have_atomics_support = ((struct amd_sriov_msg_pf2vf_info *)

			adev->virt.fw_reserve.p_pf2vf)->pcie_atomic_ops_enabled_flags ==

			adev->virt.fw_reserve.p_pf2vf)->pcie_atomic_ops_support_flags ==

			(PCI_EXP_DEVCAP2_ATOMIC_COMP32 | PCI_EXP_DEVCAP2_ATOMIC_COMP64);

	else

		adev->have_atomics_support =