Received-SPF: pass (google.com: domain of linux-kernel+bounces-153103-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <68f02c5c-5591-4d6f-9926-b0fc6f9f6287@amd.com>
Date: Mon, 22 Apr 2024 11:40:26 +0200
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] drm/amdgpu: Fixup bad vram size on gmc v6 and v7
To: Qiang Ma <maqianga@uniontech.com>, alexander.deucher@amd.com,
 Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch,
 srinivasan.shanmugam@amd.com, Arunpravin.PaneerSelvam@amd.com,
 le.ma@amd.com, Felix.Kuehling@amd.com, mukul.joshi@amd.com
Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
 linux-kernel@vger.kernel.org
References: <20240422052608.5297-1-maqianga@uniontech.com>
Content-Language: en-US
From: =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>
In-Reply-To: <20240422052608.5297-1-maqianga@uniontech.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?NmphTVpoaktxcm5uTk1wcDhmRVNqTDdRWHVQVW4wZnlCVzNrbFdkMjc3T1Z4?=
 =?utf-8?B?M3p2NmpLa0ZqNFFxL09mMkk3MEhjODZYUmlTaHFabnVwNWNsNUY2ME1VYmtX?=
 =?utf-8?B?WG1zNHB3MUFaVlN5ajJIdXRKNUhTSFIwWEZCd3NMdDdwZnVZVy85REdlODg2?=
 =?utf-8?B?bDN2Z0s4TGlhVU8yREtXcU1NTjVrcXNZbWpUOWhnKzdzTkpyUFc3cytDd2U4?=
 =?utf-8?B?K3didmhWNCtmZWZBMEdGaHpRYW94MFhSSVM5SHEvbXNlOHNQenE0aW9Nek5J?=
 =?utf-8?B?UUE2RE1EY2diVmU2eDRFSkw2aWNxZkZGWHphOGIzSXdzbHY4TEZhSjlVYUlL?=
 =?utf-8?B?SXlaeGRNNGU3Z282MHhxeUJIclNRd3p0TG9tNHpQVng0My9EK2ptdUFpMXN5?=
 =?utf-8?B?eWgwa3ZLQ1dqaWtEeWNrQnZWZFJoQkV4K1A4dXM4a3lkMDFLOUVnbHlrTnRG?=
 =?utf-8?B?TEMvazZWaVVxbTZlMHhTYkpLUXpmbU1oaGEwRFpSVFFRTWdicmFuMk0xTlhw?=
 =?utf-8?B?dzVHbnI5R3UwcFVOVGRWYlp4ZlpGUUVpKy81aFp1aUtPYTZHclR4VXFZZ1NB?=
 =?utf-8?B?cS9GNGJPdW1YVkd3cVVMSWdEWlplTGFzb1dLNzZudHdkZ2hnNFFaOUJXSTly?=
 =?utf-8?B?TERWNnhUZVIyd2IveU5PdGxudng4Y3lpZ2dTZ2RwaFg5eHpFcTQ3UmpWb2xx?=
 =?utf-8?B?bSs2ODNSNUZMejBHRHl1UmNKWThqM0FYeml4REZnYnplalJCUEVwbDBEbG45?=
 =?utf-8?B?UzlLaWtZdDBqSmx1cGsvSVM2K0drY1ppSGkzUmhVK0lKWHNyRDdTb1NMWDYv?=
 =?utf-8?B?aDVHc2tnUkt6d0k0akdRSVBGSzZhNisyRG0wdlJlZU9LWUZlTjZIYitVNHdy?=
 =?utf-8?B?UFVmTngxRHJPQlIrUk5WN0I0UlU4bFdpdDZsQjZReWJFYTZnRDZDdDRXZ3R6?=
 =?utf-8?B?WlZWZmdBVDlhNEVGVmxXaVNjRmY0OFBMdFFRUlpxcEYzRGxxdkprK1lQUEt2?=
 =?utf-8?B?RlBOQXpRVFZkUmdhVTlwQVllSFVsdzkzc0ZNZGU1TFZOT0kwMisxbGNOZEt0?=
 =?utf-8?B?Q0RmUjFvTG5FdTM1MXE3MVJmR0Y1aG1TMGNmYVcwRVdRMG9IbEJvR2dWT1R1?=
 =?utf-8?B?YTVRbHJCRGJaU1ZLTFhBNEJmSU1wdUFab3lHVlJHaXNIckZWUll4blRIMm5J?=
 =?utf-8?B?aVZXb2xtRk4yMGxqdklLNWlmczMrdk5ad2NhM0lmQ3NqV3A3dnQ4a09ib25Y?=
 =?utf-8?B?Ti9wZU5lS1VLcEpyMU1aYkMwUzl2M1k1QVBXS2ZvQzBXZWM5c1dUOVg1NnMx?=
 =?utf-8?B?Tk9LaXVBOEVZSFFYMlBHS3U1eTBtR3VLTG9kUXlzWFJ6b1FCR1paVytYd21N?=
 =?utf-8?B?cFZWQ2JyeWcydWxWYXZrcWF4U1lqbDNad2V4c2FjVzJ5TVdVUFBxQWNra3ZQ?=
 =?utf-8?B?RHZSeFBuNERNdkt4anBGcHpvemxESDdOY1NjNG1WeTBHMGhwSDhENXB5NU4w?=
 =?utf-8?B?TFJGQUIyOURTRlFXTWRSZzh6Y3NlOHdYbmJWUll5WUx5Yk1lSXZMUU55cGF6?=
 =?utf-8?B?eDAzT1BnSWp2WkQyMENGVG9pL1gyQmFWelJ6cDBzRGFZM0dHNWVmMEpYQ1hD?=
 =?utf-8?B?YkFrTllHcjVGQ1Q4VkM4dnNwK290dUNFQUo2WHV5SVlGOFhXUEs0M3VKMVox?=
 =?utf-8?B?TTFUaEs3M1ArRnpyQW53c1lrSGNQTEsvN3doeTFCNGlud1kvZWhFc1hacjE4?=
 =?utf-8?B?aWR6YXAyRDlRUTAzNWV4YSs4V1ROQTlFUk1VeUtlVUlTb2dWV2IyVC9YS3kz?=
 =?utf-8?B?c3JtMElXeEJzbG1PTG9INURtdWg0ZENSYThBOVpUSTBua2ZETnFYN3h0V0JO?=
 =?utf-8?B?VjUxSzlwRXJKOW9OTW5wbWIzWGJYeTE0aVdzUkJkRXVMNnEzL1ROOHhsWFhQ?=
 =?utf-8?B?T1FHMnBmUU5SMDN6M2VnNjc4VnpTTVk3c05peDlobnJBNU0veWJkem84S2tP?=
 =?utf-8?B?UXBTamNobDRMV0kxMi8yWVdsRkx0TlgzcTBqYU1jMXlTSWMwYnNIYzNCOGhM?=
 =?utf-8?B?bGRvZ0c3a2hmRWkwbENDOTVYNEVNQkhMMTRrQUJ4bzloZFZIWGZkQmtnQjJM?=
 =?utf-8?Q?1Rzc/0KsfxgaB4FvRLw4Tk+9L?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 57757a7c-bda0-4709-59ac-08dc62b042b2
X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB5685.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2024 09:40:35.4014
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: KEeB1BCfo3AfWPZTTUvbU1cayYIn+LoCOWtt1VaUsBgFGZWKleOHH6BGpS6ry4J+
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7577

Am 22.04.24 um 07:26 schrieb Qiang Ma:
> Some boards(like Oland PRO: 0x1002:0x6613) seem to have
> garbage in the upper 16 bits of the vram size register,
> kern log as follows:
>
> [    6.000000] [drm] Detected VRAM RAM=2256537600M, BAR=256M
> [    6.007812] [drm] RAM width 64bits GDDR5
> [    6.031250] [drm] amdgpu: 2256537600M of VRAM memory ready
>
> This is obviously not true, check for this and clamp the size
> properly. Fixes boards reporting bogus amounts of vram,
> kern log as follows:
>
> [    2.789062] [drm] Probable bad vram size: 0x86800800
> [    2.789062] [drm] Detected VRAM RAM=2048M, BAR=256M
> [    2.789062] [drm] RAM width 64bits GDDR5
> [    2.789062] [drm] amdgpu: 2048M of VRAM memory ready

Well we had patches like this one here before and so far we always 
rejected them.

When the mmCONFIG_MEMSIZE register isn't properly initialized then there 
is something wrong with your hardware.

Working around that in the software driver is not going to fly.

Regards,
Christian.

> Signed-off-by: Qiang Ma <maqianga@uniontech.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 11 +++++++++--
>   drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 ++++++++++---
>   2 files changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> index 23b478639921..3703695f7789 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> @@ -309,8 +309,15 @@ static int gmc_v6_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);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> index 3da7b6a2b00d..1df1fc578ff6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> @@ -316,10 +316,10 @@ static void gmc_v7_0_mc_program(struct amdgpu_device *adev)
>   static int gmc_v7_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 */
> @@ -363,8 +363,15 @@ static int gmc_v7_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);