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

Commit 03ba88cf authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gmc6: disable legacy vga features in gmc init (v2) 



Needs to be done when the MC is set up.

v2: make consistent with other asics

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7b8bd6bb

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

+13 −1
Original line number Diff line number Diff line
@@ -249,7 +249,19 @@ static void gmc_v6_0_mc_program(struct amdgpu_device *adev) 
		dev_warn(adev->dev, "Wait for MC idle timedout !\n");

	}



	WREG32(mmVGA_HDP_CONTROL, VGA_HDP_CONTROL__VGA_MEMORY_DISABLE_MASK);

	if (adev->mode_info.num_crtc) {

		u32 tmp;



		/* Lockout access through VGA aperture*/

		tmp = RREG32(mmVGA_HDP_CONTROL);

		tmp |= VGA_HDP_CONTROL__VGA_MEMORY_DISABLE_MASK;

		WREG32(mmVGA_HDP_CONTROL, tmp);



		/* disable VGA render */

		tmp = RREG32(mmVGA_RENDER_CONTROL);

		tmp &= ~VGA_VSTATUS_CNTL;

		WREG32(mmVGA_RENDER_CONTROL, tmp);

	}

	/* Update configuration */

	WREG32(mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,

	       adev->mc.vram_start >> 12);