Am 28.08.2018 um 04:52 schrieb Zhang, Jerry (Junwei):
> On 08/28/2018 12:53 AM, Christian König wrote:
>> Enable the old AGP aperture to avoid GART mappings.
>>
>> Signed-off-by: Christian König <christian.koenig at amd.com>
>> ---
>> Â drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 10 +++++-----
>>  drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c   | 1 +
>>  drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 10 +++++-----
>> Â 3 files changed, 11 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
>> b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
>> index 3403ded39d13..ffd0ec9586d1 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
>> @@ -65,16 +65,16 @@ static void
>> gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)
>> Â {
>> Â Â Â Â Â uint64_t value;
>>
>> -Â Â Â /* Disable AGP. */
>> +Â Â Â /* Program the AGP BAR */
>> Â Â Â Â Â WREG32_SOC15(GC, 0, mmMC_VM_AGP_BASE, 0);
>> -Â Â Â WREG32_SOC15(GC, 0, mmMC_VM_AGP_TOP, 0);
>> -Â Â Â WREG32_SOC15(GC, 0, mmMC_VM_AGP_BOT, 0xFFFFFFFF);
>> +Â Â Â WREG32_SOC15(GC, 0, mmMC_VM_AGP_BOT, adev->gmc.agp_start >> 24);
>> +Â Â Â WREG32_SOC15(GC, 0, mmMC_VM_AGP_TOP, adev->gmc.agp_end >> 24);
>>
>> Â Â Â Â Â /* Program the system aperture low logical page number. */
>> Â Â Â Â Â WREG32_SOC15(GC, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,
>> -Â Â Â Â Â Â Â Â Â Â Â Â adev->gmc.vram_start >> 18);
>> +Â Â Â Â Â Â Â Â Â Â Â Â min(adev->gmc.vram_start, adev->gmc.agp_start) >> 18);
>> Â Â Â Â Â WREG32_SOC15(GC, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR,
>> -Â Â Â Â Â Â Â Â Â Â Â Â adev->gmc.vram_end >> 18);
>> +Â Â Â Â Â Â Â Â Â Â Â Â max(adev->gmc.vram_end, adev->gmc.agp_end) >> 18);
>
> It may not work for AGP after GART range.
>
> |--- vram ---|--- GART ---|--- AGP ---|
>
> in this case, we may have to replace AGP and GART range.
Yeah, that is exactly the reason why I've came up with "drm/amdgpu: put
GART away from VRAM v2".
With this patch that scenario should never happen.
Regards,
Christian.
>
> Regards,
> Jerry
>
>>
>> Â Â Â Â Â /* Set default page address. */
>> Â Â Â Â Â value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start
>> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
>> b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
>> index 60c8f848c102..3f40c153039f 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
>> @@ -751,6 +751,7 @@ static void gmc_v9_0_vram_gtt_location(struct
>> amdgpu_device *adev,
>> Â Â Â Â Â Â Â Â Â base = mmhub_v1_0_get_fb_location(adev);
>> Â Â Â Â Â amdgpu_gmc_vram_location(adev, &adev->gmc, base);
>> Â Â Â Â Â amdgpu_gmc_gart_location(adev, mc);
>> +Â Â Â amdgpu_gmc_agp_location(adev, mc);
>> Â Â Â Â Â /* base offset of vram pages */
>> Â Â Â Â Â adev->vm_manager.vram_base_offset =
>> gfxhub_v1_0_get_mc_fb_offset(adev);
>> Â }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
>> b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
>> index 5f6a9c85488f..73d7c075dd33 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
>> @@ -76,16 +76,16 @@ static void
>> mmhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)
>> Â Â Â Â Â uint64_t value;
>> Â Â Â Â Â uint32_t tmp;
>>
>> -Â Â Â /* Disable AGP. */
>> +Â Â Â /* Program the AGP BAR */
>> Â Â Â Â Â WREG32_SOC15(MMHUB, 0, mmMC_VM_AGP_BASE, 0);
>> -Â Â Â WREG32_SOC15(MMHUB, 0, mmMC_VM_AGP_TOP, 0);
>> -Â Â Â WREG32_SOC15(MMHUB, 0, mmMC_VM_AGP_BOT, 0x00FFFFFF);
>> +Â Â Â WREG32_SOC15(MMHUB, 0, mmMC_VM_AGP_BOT, adev->gmc.agp_start >> 24);
>> +Â Â Â WREG32_SOC15(MMHUB, 0, mmMC_VM_AGP_TOP, adev->gmc.agp_end >> 24);
>>
>> Â Â Â Â Â /* Program the system aperture low logical page number. */
>> Â Â Â Â Â WREG32_SOC15(MMHUB, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,
>> -Â Â Â Â Â Â Â Â Â Â Â Â adev->gmc.vram_start >> 18);
>> +Â Â Â Â Â Â Â Â Â Â Â Â min(adev->gmc.vram_start, adev->gmc.agp_start) >> 18);
>> Â Â Â Â Â WREG32_SOC15(MMHUB, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR,
>> -Â Â Â Â Â Â Â Â Â Â Â Â adev->gmc.vram_end >> 18);
>> +Â Â Â Â Â Â Â Â Â Â Â Â max(adev->gmc.vram_end, adev->gmc.agp_end) >> 18);
>>
>> Â Â Â Â Â /* Set default page address. */
>> Â Â Â Â Â value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start +
>>
