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

Commit 46fcd2b3 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon/kms: Force HDP_NONSURF to maximum size 

HDP non surface should cover the whole VRAM but we were misscomputing
the size and we endup in some case not covering the VRAM at all (if
VRAM size were > 1G). Covering more than the VRAM size shouldn't be
an issue.

Fix : https://bugs.freedesktop.org/show_bug.cgi?id=28016



[airlied: add evergreen fix]

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 2ff776cf

drivers/gpu/drm/radeon/evergreen.c

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ static void evergreen_mc_program(struct radeon_device *rdev) 
	WREG32(MC_VM_FB_LOCATION, tmp);

	WREG32(HDP_NONSURFACE_BASE, (rdev->mc.vram_start >> 8));

	WREG32(HDP_NONSURFACE_INFO, (2 << 7));

	WREG32(HDP_NONSURFACE_SIZE, (rdev->mc.mc_vram_size - 1) | 0x3FF);

	WREG32(HDP_NONSURFACE_SIZE, 0x3FFFFFFF);

	if (rdev->flags & RADEON_IS_AGP) {

		WREG32(MC_VM_AGP_TOP, rdev->mc.gtt_end >> 16);

		WREG32(MC_VM_AGP_BOT, rdev->mc.gtt_start >> 16);

drivers/gpu/drm/radeon/r600.c

+1 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ static void r600_mc_program(struct radeon_device *rdev) 
	WREG32(MC_VM_FB_LOCATION, tmp);

	WREG32(HDP_NONSURFACE_BASE, (rdev->mc.vram_start >> 8));

	WREG32(HDP_NONSURFACE_INFO, (2 << 7));

	WREG32(HDP_NONSURFACE_SIZE, rdev->mc.mc_vram_size | 0x3FF);

	WREG32(HDP_NONSURFACE_SIZE, 0x3FFFFFFF);

	if (rdev->flags & RADEON_IS_AGP) {

		WREG32(MC_VM_AGP_TOP, rdev->mc.gtt_end >> 22);

		WREG32(MC_VM_AGP_BOT, rdev->mc.gtt_start >> 22);

drivers/gpu/drm/radeon/rv770.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static void rv770_mc_program(struct radeon_device *rdev) 
	WREG32(MC_VM_FB_LOCATION, tmp);

	WREG32(HDP_NONSURFACE_BASE, (rdev->mc.vram_start >> 8));

	WREG32(HDP_NONSURFACE_INFO, (2 << 7));

	WREG32(HDP_NONSURFACE_SIZE, (rdev->mc.mc_vram_size - 1) | 0x3FF);

	WREG32(HDP_NONSURFACE_SIZE, 0x3FFFFFFF);

	if (rdev->flags & RADEON_IS_AGP) {

		WREG32(MC_VM_AGP_TOP, rdev->mc.gtt_end >> 16);

		WREG32(MC_VM_AGP_BOT, rdev->mc.gtt_start >> 16);