Commit 1f8bdc31 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.13-2024-11-06' of... 

Merge tag 'amd-drm-next-6.13-2024-11-06' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-6.13-2024-11-06:

amdgpu:
- Misc cleanups
- OLED fixes
- DCN 4.x fixes
- DCN 3.5 fixes
- 8K fixes
- IPS fixes
- DSC fixes
- S3 fix
- KASAN fix
- SMU13 fixes
- fdinfo fixes
- USB-C fixes
- ACPI fix
- Fix dummy page overlapping mappings
- Fix workload profile handling
- Add user control for zero RPM on SMU13
- Cleaner shader updates
- Stop syncing PRT map operations
- Debugfs permissions fixes
- Debugfs bounds check fix
- RAS cleanups
- Enforce isolation updates

amdkfd:
- Add topology cap flag for per queue reset
- Add an interface to query whether KFD queues are present
- Use dynamic allocation for get_cu_occupancy

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


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

Documentation/gpu/amdgpu/thermal.rst

+12 −0
Original line number Diff line number Diff line
@@ -100,6 +100,18 @@ fan_minimum_pwm 
.. kernel-doc:: drivers/gpu/drm/amd/pm/amdgpu_pm.c

   :doc: fan_minimum_pwm



fan_zero_rpm_enable

----------------------



.. kernel-doc:: drivers/gpu/drm/amd/pm/amdgpu_pm.c

   :doc: fan_zero_rpm_enable



fan_zero_rpm_stop_temperature

-----------------------------



.. kernel-doc:: drivers/gpu/drm/amd/pm/amdgpu_pm.c

   :doc: fan_zero_rpm_stop_temperature



GFXOFF

======

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

+1 −3
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 


#define MAX_GPU_INSTANCE		64



#define GFX_SLICE_PERIOD		msecs_to_jiffies(250)

#define GFX_SLICE_PERIOD_MS		250



struct amdgpu_gpu_instance {

	struct amdgpu_device		*adev;
@@ -1111,8 +1111,6 @@ struct amdgpu_device { 
	bool				in_s3;

	bool				in_s4;

	bool				in_s0ix;

	/* indicate amdgpu suspension status */

	bool				suspend_complete;



	enum pp_mp1_state               mp1_state;

	struct amdgpu_doorbell_index doorbell_index;

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

+2 −2
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ static union acpi_object *amdgpu_atif_call(struct amdgpu_atif *atif, 
				      &buffer);

	obj = (union acpi_object *)buffer.pointer;



	/* Fail if calling the method fails and ATIF is supported */

	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {

	/* Fail if calling the method fails */

	if (ACPI_FAILURE(status)) {

		DRM_DEBUG_DRIVER("failed to evaluate ATIF got %s\n",

				 acpi_format_exception(status));

		kfree(obj);

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

+9 −0
Original line number Diff line number Diff line
@@ -890,6 +890,15 @@ int amdgpu_amdkfd_start_sched(struct amdgpu_device *adev, uint32_t node_id) 
	return kgd2kfd_start_sched(adev->kfd.dev, node_id);

}



/* check if there are KFD queues active */

bool amdgpu_amdkfd_compute_active(struct amdgpu_device *adev, uint32_t node_id)

{

	if (!adev->kfd.init_complete)

		return false;



	return kgd2kfd_compute_active(adev->kfd.dev, node_id);

}



/* Config CGTT_SQ_CLK_CTRL */

int amdgpu_amdkfd_config_sq_perfmon(struct amdgpu_device *adev, uint32_t xcp_id,

	bool core_override_enable, bool reg_override_enable, bool perfmon_override_enable)

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

+7 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ int amdgpu_amdkfd_start_sched(struct amdgpu_device *adev, uint32_t node_id); 
int amdgpu_amdkfd_stop_sched(struct amdgpu_device *adev, uint32_t node_id);

int amdgpu_amdkfd_config_sq_perfmon(struct amdgpu_device *adev, uint32_t xcp_id,

	bool core_override_enable, bool reg_override_enable, bool perfmon_override_enable);

bool amdgpu_amdkfd_compute_active(struct amdgpu_device *adev, uint32_t node_id);





/* Read user wptr from a specified user address space with page fault
@@ -431,6 +432,7 @@ int kgd2kfd_check_and_lock_kfd(void); 
void kgd2kfd_unlock_kfd(void);

int kgd2kfd_start_sched(struct kfd_dev *kfd, uint32_t node_id);

int kgd2kfd_stop_sched(struct kfd_dev *kfd, uint32_t node_id);

bool kgd2kfd_compute_active(struct kfd_dev *kfd, uint32_t node_id);

#else

static inline int kgd2kfd_init(void)

{
@@ -511,5 +513,10 @@ static inline int kgd2kfd_stop_sched(struct kfd_dev *kfd, uint32_t node_id) 
{

	return 0;

}



static inline bool kgd2kfd_compute_active(struct kfd_dev *kfd, uint32_t node_id)

{

	return false;

}

#endif

#endif /* AMDGPU_AMDKFD_H_INCLUDED */