Commit 7beae483 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.7-2023-12-13' of... 

Merge tag 'amd-drm-fixes-6.7-2023-12-13' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.7-2023-12-13:

amdgpu:
- Fix suspend fix that got accidently mangled last week
- Fix OD regression
- PSR fixes
- OLED Backlight regression fix
- JPEG 4.0.5 fix
- Misc display fixes
- SDMA 5.2 fix
- SDMA 2.4 regression fix
- GPUVM race fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231213221122.4937-1-alexander.deucher@amd.com
parents 51af5563 a4236c4b

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

+0 −2
Original line number Diff line number Diff line
@@ -4516,8 +4516,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 


	amdgpu_ras_suspend(adev);



	amdgpu_ttm_set_buffer_funcs_status(adev, false);



	amdgpu_device_ip_suspend_phase1(adev);



	if (!adev->in_s0ix)

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

+2 −0
Original line number Diff line number Diff line
@@ -1343,6 +1343,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) 


	abo = ttm_to_amdgpu_bo(bo);



	WARN_ON(abo->vm_bo);



	if (abo->kfd_bo)

		amdgpu_amdkfd_release_notify(abo);

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

+2 −1
Original line number Diff line number Diff line
@@ -642,13 +642,14 @@ static void amdgpu_vm_pt_free(struct amdgpu_vm_bo_base *entry) 


	if (!entry->bo)

		return;



	entry->bo->vm_bo = NULL;

	shadow = amdgpu_bo_shadowed(entry->bo);

	if (shadow) {

		ttm_bo_set_bulk_move(&shadow->tbo, NULL);

		amdgpu_bo_unref(&shadow);

	}

	ttm_bo_set_bulk_move(&entry->bo->tbo, NULL);

	entry->bo->vm_bo = NULL;



	spin_lock(&entry->vm->status_lock);

	list_del(&entry->vm_status);

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

+8 −7
Original line number Diff line number Diff line
@@ -155,13 +155,6 @@ static int jpeg_v4_0_5_hw_init(void *handle) 
	struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec;

	int r;



	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,

				(adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);



	WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL,

		ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT |

		VCN_JPEG_DB_CTRL__EN_MASK);



	r = amdgpu_ring_test_helper(ring);

	if (r)

		return r;
@@ -336,6 +329,14 @@ static int jpeg_v4_0_5_start(struct amdgpu_device *adev) 
	if (adev->pm.dpm_enabled)

		amdgpu_dpm_enable_jpeg(adev, true);



	/* doorbell programming is done for every playback */

	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,

				(adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);



	WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL,

		ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT |

		VCN_JPEG_DB_CTRL__EN_MASK);



	/* disable power gating */

	r = jpeg_v4_0_5_disable_static_power_gating(adev);

	if (r)

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

+2 −2
Original line number Diff line number Diff line
@@ -813,12 +813,12 @@ static int sdma_v2_4_early_init(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	int r;



	adev->sdma.num_instances = SDMA_MAX_INSTANCE;



	r = sdma_v2_4_init_microcode(adev);

	if (r)

		return r;



	adev->sdma.num_instances = SDMA_MAX_INSTANCE;



	sdma_v2_4_set_ring_funcs(adev);

	sdma_v2_4_set_buffer_funcs(adev);

	sdma_v2_4_set_vm_pte_funcs(adev);