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

Merge tag 'amd-drm-fixes-6.4-2023-05-31' of... 

Merge tag 'amd-drm-fixes-6.4-2023-05-31' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.4-2023-05-31:

amdgpu:
- Fix mclk and fclk output ordering on some APUs
- Fix display regression with 5K VRR
- VCN, JPEG spurious interrupt warning fixes
- Fix SI DPM on some ARM64 platforms
- Fix missing TMZ enablement on GC 11.0.1

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230601033846.7628-1-alexander.deucher@amd.com
parents 7877cb91 663b930e

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

+2 −1
Original line number Diff line number Diff line
@@ -593,6 +593,8 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev) 
	case IP_VERSION(9, 3, 0):

	/* GC 10.3.7 */

	case IP_VERSION(10, 3, 7):

	/* GC 11.0.1 */

	case IP_VERSION(11, 0, 1):

		if (amdgpu_tmz == 0) {

			adev->gmc.tmz_enabled = false;

			dev_info(adev->dev,
@@ -616,7 +618,6 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev) 
	case IP_VERSION(10, 3, 1):

	/* YELLOW_CARP*/

	case IP_VERSION(10, 3, 3):

	case IP_VERSION(11, 0, 1):

	case IP_VERSION(11, 0, 4):

		/* Don't enable it by default yet.

		 */

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

+26 −1
Original line number Diff line number Diff line
@@ -241,6 +241,31 @@ int amdgpu_jpeg_process_poison_irq(struct amdgpu_device *adev, 
	return 0;

}



int amdgpu_jpeg_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	int r, i;



	r = amdgpu_ras_block_late_init(adev, ras_block);

	if (r)

		return r;



	if (amdgpu_ras_is_supported(adev, ras_block->block)) {

		for (i = 0; i < adev->jpeg.num_jpeg_inst; ++i) {

			if (adev->jpeg.harvest_config & (1 << i))

				continue;



			r = amdgpu_irq_get(adev, &adev->jpeg.inst[i].ras_poison_irq, 0);

			if (r)

				goto late_fini;

		}

	}

	return 0;



late_fini:

	amdgpu_ras_block_late_fini(adev, ras_block);

	return r;

}



int amdgpu_jpeg_ras_sw_init(struct amdgpu_device *adev)

{

	int err;
@@ -262,7 +287,7 @@ int amdgpu_jpeg_ras_sw_init(struct amdgpu_device *adev) 
	adev->jpeg.ras_if = &ras->ras_block.ras_comm;



	if (!ras->ras_block.ras_late_init)

		ras->ras_block.ras_late_init = amdgpu_ras_block_late_init;

		ras->ras_block.ras_late_init = amdgpu_jpeg_ras_late_init;



	return 0;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct amdgpu_jpeg_reg{ 
struct amdgpu_jpeg_inst {

	struct amdgpu_ring ring_dec;

	struct amdgpu_irq_src irq;

	struct amdgpu_irq_src ras_poison_irq;

	struct amdgpu_jpeg_reg external;

};
@@ -72,6 +73,8 @@ int amdgpu_jpeg_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout); 
int amdgpu_jpeg_process_poison_irq(struct amdgpu_device *adev,

				struct amdgpu_irq_src *source,

				struct amdgpu_iv_entry *entry);

int amdgpu_jpeg_ras_late_init(struct amdgpu_device *adev,

				struct ras_common_if *ras_block);

int amdgpu_jpeg_ras_sw_init(struct amdgpu_device *adev);



#endif /*__AMDGPU_JPEG_H__*/

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

+26 −1
Original line number Diff line number Diff line
@@ -1181,6 +1181,31 @@ int amdgpu_vcn_process_poison_irq(struct amdgpu_device *adev, 
	return 0;

}



int amdgpu_vcn_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	int r, i;



	r = amdgpu_ras_block_late_init(adev, ras_block);

	if (r)

		return r;



	if (amdgpu_ras_is_supported(adev, ras_block->block)) {

		for (i = 0; i < adev->vcn.num_vcn_inst; i++) {

			if (adev->vcn.harvest_config & (1 << i))

				continue;



			r = amdgpu_irq_get(adev, &adev->vcn.inst[i].ras_poison_irq, 0);

			if (r)

				goto late_fini;

		}

	}

	return 0;



late_fini:

	amdgpu_ras_block_late_fini(adev, ras_block);

	return r;

}



int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev)

{

	int err;
@@ -1202,7 +1227,7 @@ int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev) 
	adev->vcn.ras_if = &ras->ras_block.ras_comm;



	if (!ras->ras_block.ras_late_init)

		ras->ras_block.ras_late_init = amdgpu_ras_block_late_init;

		ras->ras_block.ras_late_init = amdgpu_vcn_ras_late_init;



	return 0;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ struct amdgpu_vcn_inst { 
	struct amdgpu_ring	ring_enc[AMDGPU_VCN_MAX_ENC_RINGS];

	atomic_t		sched_score;

	struct amdgpu_irq_src	irq;

	struct amdgpu_irq_src	ras_poison_irq;

	struct amdgpu_vcn_reg	external;

	struct amdgpu_bo	*dpg_sram_bo;

	struct dpg_pause_state	pause_state;
@@ -400,6 +401,8 @@ void amdgpu_debugfs_vcn_fwlog_init(struct amdgpu_device *adev, 
int amdgpu_vcn_process_poison_irq(struct amdgpu_device *adev,

			struct amdgpu_irq_src *source,

			struct amdgpu_iv_entry *entry);

int amdgpu_vcn_ras_late_init(struct amdgpu_device *adev,

			struct ras_common_if *ras_block);

int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev);



#endif