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

Merge tag 'amd-drm-fixes-6.6-2023-10-11' of... 

Merge tag 'amd-drm-fixes-6.6-2023-10-11' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.6-2023-10-11:

amdgpu:
- Seemless boot fix
- Fix TTM BO resource check
- SI fix for doorbell handling

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231012025637.7783-1-alexander.deucher@amd.com
parents 7731cb65 3806a8c6

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

+4 −0
Original line number Diff line number Diff line
@@ -142,6 +142,10 @@ int amdgpu_doorbell_create_kernel_doorbells(struct amdgpu_device *adev) 
	int r;

	int size;



	/* SI HW does not have doorbells, skip allocation */

	if (adev->doorbell.num_kernel_doorbells == 0)

		return 0;



	/* Reserve first num_kernel_doorbells (page-aligned) for kernel ops */

	size = ALIGN(adev->doorbell.num_kernel_doorbells * sizeof(u32), PAGE_SIZE);

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

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static inline bool amdgpu_bo_in_cpu_visible_vram(struct amdgpu_bo *bo) 
	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	struct amdgpu_res_cursor cursor;



	if (bo->tbo.resource->mem_type != TTM_PL_VRAM)

	if (!bo->tbo.resource || bo->tbo.resource->mem_type != TTM_PL_VRAM)

		return false;



	amdgpu_res_first(bo->tbo.resource, 0, amdgpu_bo_size(bo), &cursor);

drivers/gpu/drm/amd/display/dc/core/dc.c

+3 −0
Original line number Diff line number Diff line
@@ -1262,6 +1262,9 @@ static void disable_vbios_mode_if_required( 
		if (stream == NULL)

			continue;



		if (stream->apply_seamless_boot_optimization)

			continue;



		// only looking for first odm pipe

		if (pipe->prev_odm_pipe)

			continue;