lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 390/563] drm/amdgpu: fixup bad vram size on gmc v8
    Date
    From: Zongmin Zhou <zhouzongmin@kylinos.cn>

    [ Upstream commit 11544d77e3974924c5a9c8a8320b996a3e9b2f8b ]

    Some boards(like RX550) seem to have garbage in the upper
    16 bits of the vram size register. Check for
    this and clamp the size properly. Fixes
    boards reporting bogus amounts of vram.

    after add this patch,the maximum GPU VRAM size is 64GB,
    otherwise only 64GB vram size will be used.

    Signed-off-by: Zongmin Zhou<zhouzongmin@kylinos.cn>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 ++++++++++---
    1 file changed, 10 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
    index 9ab65ca7df777..873bc33912e23 100644
    --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
    @@ -524,10 +524,10 @@ static void gmc_v8_0_mc_program(struct amdgpu_device *adev)
    static int gmc_v8_0_mc_init(struct amdgpu_device *adev)
    {
    int r;
    + u32 tmp;

    adev->gmc.vram_width = amdgpu_atombios_get_vram_width(adev);
    if (!adev->gmc.vram_width) {
    - u32 tmp;
    int chansize, numchan;

    /* Get VRAM informations */
    @@ -571,8 +571,15 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev)
    adev->gmc.vram_width = numchan * chansize;
    }
    /* size in MB on si */
    - adev->gmc.mc_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL;
    - adev->gmc.real_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL;
    + tmp = RREG32(mmCONFIG_MEMSIZE);
    + /* some boards may have garbage in the upper 16 bits */
    + if (tmp & 0xffff0000) {
    + DRM_INFO("Probable bad vram size: 0x%08x\n", tmp);
    + if (tmp & 0xffff)
    + tmp &= 0xffff;
    + }
    + adev->gmc.mc_vram_size = tmp * 1024ULL * 1024ULL;
    + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;

    if (!(adev->flags & AMD_IS_APU)) {
    r = amdgpu_device_resize_fb_bar(adev);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 23:09    [W:4.453 / U:0.668 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site