ACK/CMNT: Re: [PATCH][B/D/B-OEM] drm/amdgpu: stolen vram for raven fixing screen corruption

[Timo Aaltonen]

On 6.6.2019 9.32, Timo Aaltonen wrote:
> On 3.6.2019 13.17, Yang, Adam wrote:
>> Hi Timo,
>>
>> The following two patches are needed to fix screen corruption when
>> modprobe amdgpu for raven series.
>>
>> Please cherry-pick them into bionic hwe, disco and oem support.
>>
>>  
>>
>> 02122753f1d0ac39d8c89f20f541a519a3002e92  drm/amdgpu: reserve stollen
>> vram for raven series
>>
>> 379109351f4f6f2405cf54e7a296055f589c3ad1  drm/amdgpu: keep stolen memory
>> on picasso
> 
> Hi,
> 
> I assume you mean [D/OEM-OSP-B], meaning disco and OEM-OSP1 kernel which
> is based on disco. The HWE edge kernel will get synced with disco
> automatically, and these wouldn't apply to bionic 4.15 anyway.
> 
> Anyway, SRU patches need a public bug, so I've filed that for you:
> 
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1831846
> 
> the commits could be squashed as one, since the second one changes the
> first.

and the commits are:

commit 379109351f4f6f2405cf54e7a296055f589c3ad1
Author: Flora Cui <flora.cui at amd.com>
Date:   Fri May 17 11:33:56 2019 +0800

    drm/amdgpu: keep stolen memory on picasso
    
    otherwise screen corrupts during modprobe.
    
    Signed-off-by: Flora Cui <flora.cui at amd.com>
    Reviewed-by: Feifei Xu <Feifei.Xu at amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 3fd79e07944d..4e6fcaeb1303 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -626,6 +626,7 @@ static bool gmc_v9_0_keep_stolen_memory(struct amdgpu_device *adev)
        case CHIP_VEGA10:
                return true;
        case CHIP_RAVEN:
+               return (adev->pdev->device == 0x15d8);
        case CHIP_VEGA12:
        case CHIP_VEGA20:
        default:

commit 02122753f1d0ac39d8c89f20f541a519a3002e92
Author: Flora Cui <flora.cui at amd.com>
Date:   Tue May 28 15:52:42 2019 +0800

    drm/amdgpu: reserve stollen vram for raven series
    
    to avoid screen corruption during modprobe.
    
    Signed-off-by: Flora Cui <flora.cui at amd.com>
    Reviewed-by: Huang Rui <ray.huang at amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 3b7370d914a5..72837b8c7031 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -624,9 +624,8 @@ static bool gmc_v9_0_keep_stolen_memory(struct amdgpu_device *adev)
         */
        switch (adev->asic_type) {
        case CHIP_VEGA10:
-               return true;
        case CHIP_RAVEN:
-               return (adev->pdev->device == 0x15d8);
+               return true;
        case CHIP_VEGA12:
        case CHIP_VEGA20:
        default:


-- 
t