Commit 2bbbb07d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.12-2021-04-08' of... 

Merge tag 'amd-drm-fixes-5.12-2021-04-08' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.12-2021-04-08:

amdgpu:
- DCN3 fix
- Fix CAC setting regression for TOPAZ
- Fix ttm regression

radeon:
- Fix ttm regression

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210408045512.3879-1-alexander.deucher@amd.com
parents e49d033b cdcc108a

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

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_bo_device *bdev, 


	/* Allocate an SG array and squash pages into it */

	r = sg_alloc_table_from_pages(ttm->sg, ttm->pages, ttm->num_pages, 0,

				      ttm->num_pages << PAGE_SHIFT,

				      (u64)ttm->num_pages << PAGE_SHIFT,

				      GFP_KERNEL);

	if (r)

		goto release_sg;

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ 
	HUBP_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, SECONDARY_SURFACE_DCC_EN, mask_sh),\

	HUBP_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, SECONDARY_SURFACE_DCC_IND_BLK, mask_sh),\

	HUBP_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, SECONDARY_SURFACE_DCC_IND_BLK_C, mask_sh),\

	HUBP_SF(HUBPREQ0_DCSURF_SURFACE_FLIP_INTERRUPT, SURFACE_FLIP_INT_MASK, mask_sh),\

	HUBP_SF(HUBPRET0_HUBPRET_CONTROL, DET_BUF_PLANE1_BASE_ADDRESS, mask_sh),\

	HUBP_SF(HUBPRET0_HUBPRET_CONTROL, CROSSBAR_SRC_CB_B, mask_sh),\

	HUBP_SF(HUBPRET0_HUBPRET_CONTROL, CROSSBAR_SRC_CR_R, mask_sh),\

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c

+2 −1
Original line number Diff line number Diff line
@@ -1224,7 +1224,8 @@ static int smu7_enable_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) 
		    (hwmgr->chip_id == CHIP_POLARIS10) ||

		    (hwmgr->chip_id == CHIP_POLARIS11) ||

		    (hwmgr->chip_id == CHIP_POLARIS12) ||

		    (hwmgr->chip_id == CHIP_TONGA))

		    (hwmgr->chip_id == CHIP_TONGA) ||

		    (hwmgr->chip_id == CHIP_TOPAZ))

			PHM_WRITE_FIELD(hwmgr->device, MC_SEQ_CNTL_3, CAC_EN, 0x1);

drivers/gpu/drm/radeon/radeon_ttm.c

+2 −2
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_bo_device *bdev, struct ttm_tt * 
	if (gtt->userflags & RADEON_GEM_USERPTR_ANONONLY) {

		/* check that we only pin down anonymous memory

		   to prevent problems with writeback */

		unsigned long end = gtt->userptr + ttm->num_pages * PAGE_SIZE;

		unsigned long end = gtt->userptr + (u64)ttm->num_pages * PAGE_SIZE;

		struct vm_area_struct *vma;

		vma = find_vma(gtt->usermm, gtt->userptr);

		if (!vma || vma->vm_file || vma->vm_end < end)
@@ -386,7 +386,7 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_bo_device *bdev, struct ttm_tt * 
	} while (pinned < ttm->num_pages);



	r = sg_alloc_table_from_pages(ttm->sg, ttm->pages, ttm->num_pages, 0,

				      ttm->num_pages << PAGE_SHIFT,

				      (u64)ttm->num_pages << PAGE_SHIFT,

				      GFP_KERNEL);

	if (r)

		goto release_sg;