> -----Original Message----- > From: Alex Deucher [mailto:alexdeucher at gmail.com] > Sent: Monday, July 24, 2017 11:31 PM > To: amd-gfx at lists.freedesktop.org > Cc: Deucher, Alexander > Subject: [PATCH 4/4] drm/amdgpu/gmc9: disable legacy vga features in gmc > init > > Needs to be done when the MC is set up. > > Signed-off-by: Alex Deucher <alexander.deucher at amd.com> Can someone see if this patch fixes the problem with the lower 8 MB of vram on vega10? I think this may explain what was messing with vram on resume that caused us to reserve the first 8 MB of vram. Alex > --- > drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > index 677181f..c22899a 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > @@ -29,6 +29,8 @@ > #include "vega10/HDP/hdp_4_0_offset.h" > #include "vega10/HDP/hdp_4_0_sh_mask.h" > #include "vega10/GC/gc_9_0_sh_mask.h" > +#include "vega10/DC/dce_12_0_offset.h" > +#include "vega10/DC/dce_12_0_sh_mask.h" > #include "vega10/vega10_enum.h" > > #include "soc15_common.h" > @@ -750,6 +752,20 @@ static int gmc_v9_0_hw_init(void *handle) > /* The sequence of these two function calls matters.*/ > gmc_v9_0_init_golden_registers(adev); > > + if (adev->mode_info.num_crtc) { > + u32 tmp; > + > + /* Lockout access through VGA aperture*/ > + tmp = RREG32_SOC15(DCE, 0, mmVGA_HDP_CONTROL); > + tmp = REG_SET_FIELD(tmp, VGA_HDP_CONTROL, > VGA_MEMORY_DISABLE, 1); > + WREG32_SOC15(DCE, 0, mmVGA_HDP_CONTROL, tmp); > + > + /* disable VGA render */ > + tmp = RREG32_SOC15(DCE, 0, mmVGA_RENDER_CONTROL); > + tmp = REG_SET_FIELD(tmp, VGA_RENDER_CONTROL, > VGA_VSTATUS_CNTL, 0); > + WREG32_SOC15(DCE, 0, mmVGA_RENDER_CONTROL, tmp); > + } > + > r = gmc_v9_0_gart_enable(adev); > > return r; > -- > 2.5.5
