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

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



amd-drm-next-6.6-2023-08-18:

amdgpu:
- Panel replay fixes
- Misc checkpatch fixes
- SMU 13.x fixes
- mcbp parameter handling fix for gfx9
- RAS fixes
- Misc code cleanups
- SR-IOV fixes
- Expose both current and average power via hwmon if supported
- DP retimer fix
- Clockgating fix
- Subvp fixes
- DMCUB fixes
- Gamut remap fix
- Misc display fixes
- Allow users to force runtime pm when displays are attached
- Gracefully handle more partitions than drm nodes
- S0ix fixes
- GC 9.4.3 fixes

amdkfd:
- TBA fix for aldebaran
- Fix build without CONFIG_DYNAMIC_DEBUG
- memdup cleanup
- Fix address watch clearing

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/20230818195247.10981-1-alexander.deucher@amd.com
parents 5d21db26 ef35c7ba

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

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ extern int amdgpu_emu_mode; 
extern uint amdgpu_smu_memory_pool_size;

extern int amdgpu_smu_pptable_id;

extern uint amdgpu_dc_feature_mask;

extern uint amdgpu_freesync_vid_mode;

extern uint amdgpu_dc_debug_mask;

extern uint amdgpu_dc_visual_confirm;

extern uint amdgpu_dm_abm_level;

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

+4 −4
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ int amdgpu_acpi_pcie_performance_request(struct amdgpu_device *adev, 


	atcs_input.size = sizeof(struct atcs_pref_req_input);

	/* client id (bit 2-0: func num, 7-3: dev num, 15-8: bus num) */

	atcs_input.client_id = adev->pdev->devfn | (adev->pdev->bus->number << 8);

	atcs_input.client_id = pci_dev_id(adev->pdev);

	atcs_input.valid_flags_mask = ATCS_VALID_FLAGS_MASK;

	atcs_input.flags = ATCS_WAIT_FOR_COMPLETION;

	if (advertise)
@@ -776,7 +776,7 @@ int amdgpu_acpi_power_shift_control(struct amdgpu_device *adev, 


	atcs_input.size = sizeof(struct atcs_pwr_shift_input);

	/* dGPU id (bit 2-0: func num, 7-3: dev num, 15-8: bus num) */

	atcs_input.dgpu_id = adev->pdev->devfn | (adev->pdev->bus->number << 8);

	atcs_input.dgpu_id = pci_dev_id(adev->pdev);

	atcs_input.dev_acpi_state = dev_state;

	atcs_input.drv_state = drv_state;
@@ -1141,7 +1141,7 @@ int amdgpu_acpi_get_tmr_info(struct amdgpu_device *adev, u64 *tmr_offset, 
	if (!tmr_offset || !tmr_size)

		return -EINVAL;



	bdf = (adev->pdev->bus->number << 8) | adev->pdev->devfn;

	bdf = pci_dev_id(adev->pdev);

	dev_info = amdgpu_acpi_get_dev(bdf);

	if (!dev_info)

		return -ENOENT;
@@ -1162,7 +1162,7 @@ int amdgpu_acpi_get_mem_info(struct amdgpu_device *adev, int xcc_id, 
	if (!numa_info)

		return -EINVAL;



	bdf = (adev->pdev->bus->number << 8) | adev->pdev->devfn;

	bdf = pci_dev_id(adev->pdev);

	dev_info = amdgpu_acpi_get_dev(bdf);

	if (!dev_info)

		return -ENOENT;

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

+1 −7
Original line number Diff line number Diff line
@@ -163,12 +163,6 @@ static uint32_t kgd_gfx_aldebaran_set_address_watch( 
	return watch_address_cntl;

}



static uint32_t kgd_gfx_aldebaran_clear_address_watch(struct amdgpu_device *adev,

						      uint32_t watch_id)

{

	return 0;

}



const struct kfd2kgd_calls aldebaran_kfd2kgd = {

	.program_sh_mem_settings = kgd_gfx_v9_program_sh_mem_settings,

	.set_pasid_vmid_mapping = kgd_gfx_v9_set_pasid_vmid_mapping,
@@ -193,7 +187,7 @@ const struct kfd2kgd_calls aldebaran_kfd2kgd = { 
	.set_wave_launch_trap_override = kgd_aldebaran_set_wave_launch_trap_override,

	.set_wave_launch_mode = kgd_aldebaran_set_wave_launch_mode,

	.set_address_watch = kgd_gfx_aldebaran_set_address_watch,

	.clear_address_watch = kgd_gfx_aldebaran_clear_address_watch,

	.clear_address_watch = kgd_gfx_v9_clear_address_watch,

	.get_iq_wait_times = kgd_gfx_v9_get_iq_wait_times,

	.build_grace_period_packet_info = kgd_gfx_v9_build_grace_period_packet_info,

	.program_trap_handler_settings = kgd_gfx_v9_program_trap_handler_settings,

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

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include "amdgpu_xgmi.h"

#include "kfd_priv.h"

#include "kfd_smi_events.h"

#include <drm/ttm/ttm_tt.h>



/* Userptr restore delay, just long enough to allow consecutive VM

 * changes to accumulate

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

+12 −4
Original line number Diff line number Diff line
@@ -305,10 +305,16 @@ size_t amdgpu_device_aper_access(struct amdgpu_device *adev, loff_t pos, 


		if (write) {

			memcpy_toio(addr, buf, count);

			/* Make sure HDP write cache flush happens without any reordering

			 * after the system memory contents are sent over PCIe device

			 */

			mb();

			amdgpu_device_flush_hdp(adev, NULL);

		} else {

			amdgpu_device_invalidate_hdp(adev, NULL);

			/* Make sure HDP read cache is invalidated before issuing a read

			 * to the PCIe device

			 */

			mb();

			memcpy_fromio(buf, addr, count);

		}
@@ -3487,8 +3493,9 @@ static void amdgpu_device_set_mcbp(struct amdgpu_device *adev) 
{

	if (amdgpu_mcbp == 1)

		adev->gfx.mcbp = true;



	if ((adev->ip_versions[GC_HWIP][0] >= IP_VERSION(9, 0, 0)) &&

	else if (amdgpu_mcbp == 0)

		adev->gfx.mcbp = false;

	else if ((adev->ip_versions[GC_HWIP][0] >= IP_VERSION(9, 0, 0)) &&

		 (adev->ip_versions[GC_HWIP][0] < IP_VERSION(10, 0, 0)) &&

		 adev->gfx.num_gfx_rings)

		adev->gfx.mcbp = true;
@@ -4153,6 +4160,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 
		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, true);



	cancel_delayed_work_sync(&adev->delayed_init_work);

	flush_delayed_work(&adev->gfx.gfx_off_delay_work);



	amdgpu_ras_suspend(adev);