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

Commit 96d78e37 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gmc7: disable legacy vga features in gmc init 



Needs to be done when the MC is set up.

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 03ba88cf

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

+14 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ 
#include "oss/oss_2_0_d.h"

#include "oss/oss_2_0_sh_mask.h"



#include "dce/dce_8_0_d.h"

#include "dce/dce_8_0_sh_mask.h"



#include "amdgpu_atombios.h"



static void gmc_v7_0_set_gart_funcs(struct amdgpu_device *adev);
@@ -273,6 +276,17 @@ static void gmc_v7_0_mc_program(struct amdgpu_device *adev) 
	if (gmc_v7_0_wait_for_idle((void *)adev)) {

		dev_warn(adev->dev, "Wait for MC idle timedout !\n");

	}

	if (adev->mode_info.num_crtc) {

		/* Lockout access through VGA aperture*/

		tmp = RREG32(mmVGA_HDP_CONTROL);

		tmp = REG_SET_FIELD(tmp, VGA_HDP_CONTROL, VGA_MEMORY_DISABLE, 1);

		WREG32(mmVGA_HDP_CONTROL, tmp);



		/* disable VGA render */

		tmp = RREG32(mmVGA_RENDER_CONTROL);

		tmp = REG_SET_FIELD(tmp, VGA_RENDER_CONTROL, VGA_VSTATUS_CNTL, 0);

		WREG32(mmVGA_RENDER_CONTROL, tmp);

	}

	/* Update configuration */

	WREG32(mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,

	       adev->mc.vram_start >> 12);