Commit 90031bc3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.4-2023-03-17' of https://gitlab.freedesktop.org/agd5f/linux into drm-next 

amd-drm-next-6.4-2023-03-17:

amdgpu:
- Misc code cleanups
- Documentation fixes
- Make kobj structures const
- Add thermal throttling adjustments for supported APUs
- UMC RAS fixes
- Display reset fixes
- DCN 3.2 fixes
- Freesync fixes
- DC code reorg
- Generalize dmabuf import to work with KFD
- DC DML fixes
- SRIOV fixes
- UVD code cleanups
- IH 4.4.2 updates
- HDP 4.4.2 updates
- SDMA 4.4.2 updates
- PSP 13.0.6 updates
- Add capped/uncapped workload handling for supported APUs
- DCN 3.1.4 updates
- Re-org DC Kconfig
- USB4 fixes
- Reorg DC plane and stream handling
- Register vga_switcheroo for apple-gmux
- SMU 13.0.6 updates
- Fix error checking in read_mm_registers functions for affected families
- VCN 4.0.4 fix
- Drop redundant pci_enable_pcie_error_reporting() call
- RDNA2 SMU OD suspend/resume fix
- Expose additional memory stats via fdinfo
- RAS fixes
- Misc display fixes
- DP MST fixes
- IOMMU regression fix for KFD

amdkfd:
- Make kobj structures const
- Support for exporting buffers via dmabuf
- Multi-VMA page migration fixes
- NBIO fixes
- Misc code cleanups
- Fix possible double free
- Fix possible UAF

radeon:
- iMac fix

UAPI:
- KFD dmabuf export support.  Required for importing KFD buffers into GEM contexts and for RDMA P2P support.
  Proposed user mode changes: https://github.com/fxkamd/ROCT-Thunk-Interface/commits/fxkamd/dmabuf

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230317164416.138340-1-alexander.deucher@amd.com
parents 8bf6e202 7ee938ac

Documentation/gpu/amdgpu/display/display-manager.rst

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ The alpha blending equation is configured from DRM to DC interface by the 
following path:



1. When updating a :c:type:`drm_plane_state <drm_plane_state>`, DM calls

   :c:type:`fill_blending_from_plane_state()` that maps

   :c:type:`amdgpu_dm_plane_fill_blending_from_plane_state()` that maps

   :c:type:`drm_plane_state <drm_plane_state>` attributes to

   :c:type:`dc_plane_info <dc_plane_info>` struct to be handled in the

   OS-agnostic component (DC).

drivers/gpu/drm/amd/amdgpu/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
config DRM_AMDGPU

	tristate "AMD GPU"

	depends on DRM && PCI && MMU

	depends on !UML

	select FW_LOADER

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDMI_HELPER

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \

	amdgpu_gtt_mgr.o amdgpu_preempt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o \

	amdgpu_atomfirmware.o amdgpu_vf_error.o amdgpu_sched.o \

	amdgpu_debugfs.o amdgpu_ids.o amdgpu_gmc.o \

	amdgpu_debugfs.o amdgpu_ids.o amdgpu_gmc.o amdgpu_mmhub.o amdgpu_hdp.o \

	amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.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 \
@@ -148,6 +148,7 @@ amdgpu-y += \ 
	sdma_v3_0.o \

	sdma_v4_0.o \

	sdma_v4_4.o \

	sdma_v4_4_2.o \

	sdma_v5_0.o \

	sdma_v5_2.o \

	sdma_v6_0.o

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

+1 −7
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#include <linux/hashtable.h>

#include <linux/dma-fence.h>

#include <linux/pci.h>

#include <linux/aer.h>



#include <drm/ttm/ttm_bo.h>

#include <drm/ttm/ttm_placement.h>
@@ -1005,7 +1004,6 @@ struct amdgpu_device { 
	bool                            in_runpm;

	bool                            has_pr3;



	bool                            pm_sysfs_en;

	bool                            ucode_sysfs_en;

	bool                            psp_sysfs_en;
@@ -1095,18 +1093,14 @@ void amdgpu_mm_wreg8(struct amdgpu_device *adev, uint32_t offset, uint8_t value) 
uint8_t amdgpu_mm_rreg8(struct amdgpu_device *adev, uint32_t offset);



u32 amdgpu_device_indirect_rreg(struct amdgpu_device *adev,

				u32 pcie_index, u32 pcie_data,

				u32 reg_addr);

u64 amdgpu_device_indirect_rreg64(struct amdgpu_device *adev,

				  u32 pcie_index, u32 pcie_data,

				  u32 reg_addr);

void amdgpu_device_indirect_wreg(struct amdgpu_device *adev,

				 u32 pcie_index, u32 pcie_data,

				 u32 reg_addr, u32 reg_data);

void amdgpu_device_indirect_wreg64(struct amdgpu_device *adev,

				   u32 pcie_index, u32 pcie_data,

				   u32 reg_addr, u64 reg_data);



u32 amdgpu_device_get_rev_id(struct amdgpu_device *adev);

bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type);

bool amdgpu_device_has_dc_support(struct amdgpu_device *adev);

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

+2 −0
Original line number Diff line number Diff line
@@ -308,6 +308,8 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct amdgpu_device *adev, 
				      uint64_t va, void *drm_priv,

				      struct kgd_mem **mem, uint64_t *size,

				      uint64_t *mmap_offset);

int amdgpu_amdkfd_gpuvm_export_dmabuf(struct kgd_mem *mem,

				      struct dma_buf **dmabuf);

int amdgpu_amdkfd_get_tile_config(struct amdgpu_device *adev,

				struct tile_config *config);

void amdgpu_amdkfd_ras_poison_consumption_handler(struct amdgpu_device *adev,