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

Merge tag 'amd-drm-next-6.2-2022-11-18' of https://gitlab.freedesktop.org/agd5f/linux into drm-next 

amd-drm-next-6.2-2022-11-18:

amdgpu:
- SR-IOV fixes
- Clean up DC checks
- DCN 3.2.x fixes
- DCN 3.1.x fixes
- Don't enable degamma on asics which don't support it
- IP discovery fixes
- BACO fixes
- Fix vbios allocation handling when vkms is enabled
- Drop buggy tdr advanced mode GPU reset handling
- Fix the build when DCN is not set in kconfig
- MST DSC fixes
- Userptr fixes
- FRU and RAS EEPROM fixes
- VCN 4.x RAS support
- Aldrebaran CU occupancy reporting fix
- PSP ring cleanup

amdkfd:
- Memory limit fix
- Enable cooperative launch on gfx 10.3

amd-drm-next-6.2-2022-11-11:

amdgpu:
- SMU 13.x updates
- GPUVM TLB race fix
- DCN 3.1.4 updates
- DCN 3.2.x updates
- PSR fixes
- Kerneldoc fix
- Vega10 fan fix
- GPUVM locking fixes in error pathes
- BACO fix for Beige Goby
- EEPROM I2C address cleanup
- GFXOFF fix
- Fix DC memory leak in error pathes
- Flexible array updates
- Mtype fix for GPUVM PTEs
- Move Kconfig into amdgpu directory
- SR-IOV updates
- Fix possible memory leak in CS IOCTL error path

amdkfd:
- Fix possible memory overrun
- CRIU fixes

radeon:
- ACPI ref count fix
- HDA audio notifier support
- Move Kconfig into radeon directory

UAPI:
- Add new GEM_CREATE flags to help to transition more KFD functionality to the DRM UAPI.
  These are used internally in the driver to align location based memory coherency
  requirements from memory allocated in the KFD with how we manage GPUVM PTEs.  They
  are currently blocked in the GEM_CREATE IOCTL as we don't have a user right now.
  They are just used internally in the kernel driver for now for existing KFD memory
  allocations. So a change to the UAPI header, but no functional change in the UAPI.

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221118170807.6505-1-alexander.deucher@amd.com


Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 819683a1 aec3bb3a

drivers/gpu/drm/Kconfig

+0 −56
Original line number Diff line number Diff line
@@ -233,64 +233,8 @@ source "drivers/gpu/drm/i2c/Kconfig" 


source "drivers/gpu/drm/arm/Kconfig"



config DRM_RADEON

	tristate "ATI Radeon"

	depends on DRM && PCI && MMU

	depends on AGP || !AGP

	select FW_LOADER

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

        select DRM_KMS_HELPER

        select DRM_TTM

	select DRM_TTM_HELPER

	select POWER_SUPPLY

	select HWMON

	select BACKLIGHT_CLASS_DEVICE

	select INTERVAL_TREE

	# radeon depends on ACPI_VIDEO when ACPI is enabled, for select to work

	# ACPI_VIDEO's dependencies must also be selected.

	select INPUT if ACPI

	select ACPI_VIDEO if ACPI

	# On x86 ACPI_VIDEO also needs ACPI_WMI

	select X86_PLATFORM_DEVICES if ACPI && X86

	select ACPI_WMI if ACPI && X86

	help

	  Choose this option if you have an ATI Radeon graphics card.  There

	  are both PCI and AGP versions.  You don't need to choose this to

	  run the Radeon in plain VGA mode.



	  If M is selected, the module will be called radeon.



source "drivers/gpu/drm/radeon/Kconfig"



config DRM_AMDGPU

	tristate "AMD GPU"

	depends on DRM && PCI && MMU

	select FW_LOADER

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select DRM_SCHED

	select DRM_TTM

	select DRM_TTM_HELPER

	select POWER_SUPPLY

	select HWMON

	select BACKLIGHT_CLASS_DEVICE

	select INTERVAL_TREE

	select DRM_BUDDY

	# amdgpu depends on ACPI_VIDEO when ACPI is enabled, for select to work

	# ACPI_VIDEO's dependencies must also be selected.

	select INPUT if ACPI

	select ACPI_VIDEO if ACPI

	# On x86 ACPI_VIDEO also needs ACPI_WMI

	select X86_PLATFORM_DEVICES if ACPI && X86

	select ACPI_WMI if ACPI && X86

	help

	  Choose this option if you have a recent AMD Radeon graphics card.



	  If M is selected, the module will be called amdgpu.



source "drivers/gpu/drm/amd/amdgpu/Kconfig"



source "drivers/gpu/drm/nouveau/Kconfig"

drivers/gpu/drm/amd/amdgpu/Kconfig

+29 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: MIT



config DRM_AMDGPU

	tristate "AMD GPU"

	depends on DRM && PCI && MMU

	select FW_LOADER

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select DRM_SCHED

	select DRM_TTM

	select DRM_TTM_HELPER

	select POWER_SUPPLY

	select HWMON

	select BACKLIGHT_CLASS_DEVICE

	select INTERVAL_TREE

	select DRM_BUDDY

	# amdgpu depends on ACPI_VIDEO when ACPI is enabled, for select to work

	# ACPI_VIDEO's dependencies must also be selected.

	select INPUT if ACPI

	select ACPI_VIDEO if ACPI

	# On x86 ACPI_VIDEO also needs ACPI_WMI

	select X86_PLATFORM_DEVICES if ACPI && X86

	select ACPI_WMI if ACPI && X86

	help

	  Choose this option if you have a recent AMD Radeon graphics card.



	  If M is selected, the module will be called amdgpu.



config DRM_AMDGPU_SI

	bool "Enable amdgpu support for SI parts"

	depends on DRM_AMDGPU

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ endif 
amdgpu-$(CONFIG_COMPAT) += amdgpu_ioc32.o

amdgpu-$(CONFIG_VGA_SWITCHEROO) += amdgpu_atpx_handler.o

amdgpu-$(CONFIG_ACPI) += amdgpu_acpi.o

amdgpu-$(CONFIG_HMM_MIRROR) += amdgpu_mn.o

amdgpu-$(CONFIG_HMM_MIRROR) += amdgpu_hmm.o



include $(FULL_AMD_PATH)/pm/Makefile

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

+4 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ 
#include "amdgpu_vce.h"

#include "amdgpu_vcn.h"

#include "amdgpu_jpeg.h"

#include "amdgpu_mn.h"

#include "amdgpu_gmc.h"

#include "amdgpu_gfx.h"

#include "amdgpu_sdma.h"
@@ -1065,6 +1064,7 @@ struct amdgpu_device { 
	struct work_struct		reset_work;



	bool                            job_hang;

	bool                            dc_enabled;

};



static inline struct amdgpu_device *drm_to_adev(struct drm_device *ddev)
@@ -1122,6 +1122,8 @@ void amdgpu_device_indirect_wreg64(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);



void amdgpu_device_set_sriov_virtual_display(struct amdgpu_device *adev);



int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev,

				 struct amdgpu_reset_context *reset_context);
@@ -1295,6 +1297,7 @@ void amdgpu_device_pcie_port_wreg(struct amdgpu_device *adev, 
				u32 reg, u32 v);

struct dma_fence *amdgpu_device_switch_gang(struct amdgpu_device *adev,

					    struct dma_fence *gang);

bool amdgpu_device_has_display_hardware(struct amdgpu_device *adev);



/* atpx handler */

#if defined(CONFIG_VGA_SWITCHEROO)

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

+1 −1
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ int amdgpu_acpi_init(struct amdgpu_device *adev) 
	struct amdgpu_atif *atif = &amdgpu_acpi_priv.atif;



	if (atif->notifications.brightness_change) {

		if (amdgpu_device_has_dc_support(adev)) {

		if (adev->dc_enabled) {

#if defined(CONFIG_DRM_AMD_DC)

			struct amdgpu_display_manager *dm = &adev->dm;