Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b9832f6 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: fix use of vram scratch page on evergreen/ni 



This hunk seems to have gotten lost when I rebased the patch.

Reported-by: default avatarSylvain Bertrand <sylvain.bertrand@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7a1619b9

drivers/gpu/drm/radeon/evergreen.c

+1 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ void evergreen_mc_program(struct radeon_device *rdev) 
		WREG32(MC_VM_SYSTEM_APERTURE_HIGH_ADDR,

			rdev->mc.vram_end >> 12);

	}

	WREG32(MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR, 0);

	WREG32(MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR, rdev->vram_scratch.gpu_addr >> 12);

	if (rdev->flags & RADEON_IS_IGP) {

		tmp = RREG32(MC_FUS_VM_FB_OFFSET) & 0x000FFFFF;

		tmp |= ((rdev->mc.vram_end >> 20) & 0xF) << 24;