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

Merge tag 'amd-drm-fixes-6.8-2024-02-15-2' of... 

Merge tag 'amd-drm-fixes-6.8-2024-02-15-2' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.8-2024-02-15-2:

amdgpu:
- PSR fixes
- Suspend/resume fixes
- Link training fix
- Aspect ratio fix
- DCN 3.5 fixes
- VCN 4.x fix
- GFX 11 fix
- Misc display fixes
- Misc small fixes

amdkfd:
- Cache size reporting fix
- SIMD distribution fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240215192452.11805-1-alexander.deucher@amd.com
parents 427e337f a8ac4bca

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

+3 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ extern uint amdgpu_dc_debug_mask; 
extern uint amdgpu_dc_visual_confirm;

extern uint amdgpu_dm_abm_level;

extern int amdgpu_backlight;

extern int amdgpu_damage_clips;

extern struct amdgpu_mgpu_info mgpu_info;

extern int amdgpu_ras_enable;

extern uint amdgpu_ras_mask;
@@ -1549,9 +1550,11 @@ static inline int amdgpu_acpi_smart_shift_update(struct drm_device *dev, 
#if defined(CONFIG_ACPI) && defined(CONFIG_SUSPEND)

bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);

void amdgpu_choose_low_power_state(struct amdgpu_device *adev);

#else

static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }

static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }

static inline void amdgpu_choose_low_power_state(struct amdgpu_device *adev) { }

#endif



#if defined(CONFIG_DRM_AMD_DC)

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

+15 −0
Original line number Diff line number Diff line
@@ -1519,4 +1519,19 @@ bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) 
#endif /* CONFIG_AMD_PMC */

}



/**

 * amdgpu_choose_low_power_state

 *

 * @adev: amdgpu_device_pointer

 *

 * Choose the target low power state for the GPU

 */

void amdgpu_choose_low_power_state(struct amdgpu_device *adev)

{

	if (amdgpu_acpi_is_s0ix_active(adev))

		adev->in_s0ix = true;

	else if (amdgpu_acpi_is_s3_active(adev))

		adev->in_s3 = true;

}



#endif /* CONFIG_SUSPEND */

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

+9 −3
Original line number Diff line number Diff line
@@ -4514,13 +4514,15 @@ int amdgpu_device_prepare(struct drm_device *dev) 
	struct amdgpu_device *adev = drm_to_adev(dev);

	int i, r;



	amdgpu_choose_low_power_state(adev);



	if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)

		return 0;



	/* Evict the majority of BOs before starting suspend sequence */

	r = amdgpu_device_evict_resources(adev);

	if (r)

		return r;

		goto unprepare;



	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (!adev->ip_blocks[i].status.valid)
@@ -4529,10 +4531,15 @@ int amdgpu_device_prepare(struct drm_device *dev) 
			continue;

		r = adev->ip_blocks[i].version->funcs->prepare_suspend((void *)adev);

		if (r)

			return r;

			goto unprepare;

	}



	return 0;



unprepare:

	adev->in_s0ix = adev->in_s3 = false;



	return r;

}



/**
@@ -4569,7 +4576,6 @@ 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);

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

+13 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ int amdgpu_seamless = -1; /* auto */ 
uint amdgpu_debug_mask;

int amdgpu_agp = -1; /* auto */

int amdgpu_wbrf = -1;

int amdgpu_damage_clips = -1; /* auto */



static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work);
@@ -859,6 +860,18 @@ int amdgpu_backlight = -1; 
MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))");

module_param_named(backlight, amdgpu_backlight, bint, 0444);



/**

 * DOC: damageclips (int)

 * Enable or disable damage clips support. If damage clips support is disabled,

 * we will force full frame updates, irrespective of what user space sends to

 * us.

 *

 * Defaults to -1 (where it is enabled unless a PSR-SU display is detected).

 */

MODULE_PARM_DESC(damageclips,

		 "Damage clips support (0 = disable, 1 = enable, -1 auto (default))");

module_param_named(damageclips, amdgpu_damage_clips, int, 0444);



/**

 * DOC: tmz (int)

 * Trusted Memory Zone (TMZ) is a method to protect data being written

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

+8 −1
Original line number Diff line number Diff line
@@ -723,9 +723,16 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) 


		if (adev->gfx.gfx_off_req_count == 0 &&

		    !adev->gfx.gfx_off_state) {

			/* If going to s2idle, no need to wait */

			if (adev->in_s0ix) {

				if (!amdgpu_dpm_set_powergating_by_smu(adev,

						AMD_IP_BLOCK_TYPE_GFX, true))

					adev->gfx.gfx_off_state = true;

			} else {

				schedule_delayed_work(&adev->gfx.gfx_off_delay_work,

					      delay);

			}

		}

	} else {

		if (adev->gfx.gfx_off_req_count == 0) {

			cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work);