Received-SPF: pass (google.com: domain of linux-kernel+bounces-153396-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Message-ID: <bde48eef-4d8a-4cfa-b824-6de88c0f87fd@amd.com>
Date: Mon, 22 Apr 2024 14:59:36 +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>
Cc: 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, amd-gfx@lists.freedesktop.org,
 dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <20240422052608.5297-1-maqianga@uniontech.com>
 <68f02c5c-5591-4d6f-9926-b0fc6f9f6287@amd.com>
 <D94775003178862D+20240422203329.49844e71@john-PC>
Content-Language: en-US
From: =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>
In-Reply-To: <D94775003178862D+20240422203329.49844e71@john-PC>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?eWxVcmF3VnNZT2VBSVZORGV1QUhXSks5Um1xMFIxT29ib3N1L1RySStsUThF?=
 =?utf-8?B?TWNiS1FKa1FTWmlraWhFNDM0WmhZU2xhYzJvcWhsR1lkUXNWNmhuWlpsS1ly?=
 =?utf-8?B?Qkk3NkRCWkxlcysvRjVVWGdqTzdPUENMbVBScE5oVTFrR3VSM0wrdUx5dGp0?=
 =?utf-8?B?Q0VkQmd4VHhOVkFRbVFmYnRsYW1VclBVTnlTUG9EdU14Y0s2Y05WSmlvS3M1?=
 =?utf-8?B?YmFML0NGZHpJRlNFL3BTV05IcDRvSkoxOUZrYVFDRFd5WjJ2Y0pjTUVLNU9m?=
 =?utf-8?B?M29uUWtnMndtMERMUnBqNVBJRFk5c1hXY0VKZWJlbjZlVnY5NXNuL2VzTCtk?=
 =?utf-8?B?OVJBVlhpMFNHQmFDNGNtVmY5bm5jeElnQ1JJMHMrVDBvY1NldFhxYjIxc1Bt?=
 =?utf-8?B?U25maFFXUVp6MkRUZzM4cDFMODN1MmpGZlpGZUVWK3YxL1U1U1Q0RTd5c3pG?=
 =?utf-8?B?Ny92RTNRSmtpNG51TWhuQ05yQVhXZU9tcm90OVRwbUdRVkZCcVVodXhZaWVv?=
 =?utf-8?B?dmRYQUtzUVprS21UOE9YUVZja0hVZnY5SE9YeU9BVk5aaWl5bEVyU3REc0pY?=
 =?utf-8?B?M2t0bE9ZUnlQRHNYVUZLQkkvQ3llTEExN1NhSVE3TjBSU3JZdnlOVmptakZx?=
 =?utf-8?B?WUFBOXdkS3k0L1JRejUrcDZXZ1YxZEN5MndkZDB0aVdJUkZmV2srOFBrZ1RY?=
 =?utf-8?B?NWMza2pYN0JPNmxLTm1QR3dhT1d4VkRzTi9xa0FZaFVxdm5CR3lHWmNBWTVZ?=
 =?utf-8?B?UXEzb29tWFFVbmhFQ0p3cGY5eitKSldCZ2l1L2NlQjc1aDgvdmlncmlmVXE3?=
 =?utf-8?B?bWpGaWwvajhXbnVpQ3ZsT21oazRtbWh1NWhGamIxTEhidXJhU2thSENCYWQ2?=
 =?utf-8?B?U29BNWNFcTJWZTFOZ0sySWs0cXdBQitUc3BhZzVTbnhKRnc0SUhNVjQzNVFQ?=
 =?utf-8?B?UmtnSTZia0YrbmdaMG84NWVWT00wNEhTK2d2bGZzajU1S3dEYW5uYU9qM0tH?=
 =?utf-8?B?bGYyS3N6VGI2ZDM0RzBWeERpRmoxNEx5MG9xdnVrOXRTbno3OWpXWEt3aGo0?=
 =?utf-8?B?TCt1bktPbEtrRVVpZzV5bFF0N1lENDFlNC9GdCswRGZMb1R3M05nNlp1OTZv?=
 =?utf-8?B?OVU0cXpTWlYxNjVzdWRsSlI3dkNCU0MwdWppQWt2TDRtVEpTdzN6UTRXam5t?=
 =?utf-8?B?Nld2K2JDWkNyWld4bmErSWIvemJUTlByZ2Zpd1VIdXg3ZVVKMnJ5MTNSTUlz?=
 =?utf-8?B?Y2FGcGNsbDJDUVB2TFZ6ODkwSFJKZUY1UWh4bDF1cm5zUzlEYXZBUjFodTFZ?=
 =?utf-8?B?Y2tOVXZ5VjJxUDBxZVQvcEp6L2NYcGxtR09VYTZRS0pxMHpJTGRoT0l0ei9l?=
 =?utf-8?B?TzBFek8wREY2RnRVNmhESlB4dmVzRG55Y2l6S2ExNmRxM0pVNjMzM1IvSTQr?=
 =?utf-8?B?LzBuQ1ArTG5RN2lST042aW5DcUVkMUVFWVJlMllvWW9LczArOFQyYzRVK2l6?=
 =?utf-8?B?K09YaXNGdWNlNGdDV2U5Z294Q1lRYmZ6Z09iUmVBcWxmaENkN3hOZkd4anZV?=
 =?utf-8?B?bTFwTTk0OXBldlVVdm9RdFltUFI1S0h1RnpCUU51SW9Pa0hFTTcvRlU0cXhr?=
 =?utf-8?B?NlFrVEk5dGJQbmhNam1idEdDUzdvTHZ2b2kxSEwrSm5zbHhrYUZPOERYdlg3?=
 =?utf-8?B?NUs4SUdZejJURGNZYkZGbzJoSFV6eEdmdjBOK1prTEJyQXBHVnlPbDZuQWht?=
 =?utf-8?B?ZzZyTEV4eTZidTJCYkF4ZFk2UzdhRDNYZ1M0SEtrMnFBTmx2aFRrb2VGV012?=
 =?utf-8?B?dFJtdEpDTTg5NnNKMGppdktwemFCVkliaDRmRUVRdlZVZndjUEx1VWhXWGoz?=
 =?utf-8?B?UkZsckQxOXR2NjJENXQwUDdOdVJLNTJ6NnNFQ3pSeGtibVBzdS90eGRVdFoy?=
 =?utf-8?B?MnpSZk1CaHRTWjJLc00zRVVNWHg2blpGNUxwNE9vdXhMT0QvMTROblQyS1Nq?=
 =?utf-8?B?eElMdGhCdVU3ZTdxaHBQZlRkS283V3FmRkNVR0FRVU9pL2diZURoRlBJZzBp?=
 =?utf-8?B?d0ZkNWZ5VGw2SlkrTzM1TlNvcDdsUTB4ZTgyZ3RvZVppRWsrVjV5ajd1Y1cz?=
 =?utf-8?Q?4Mi8=3D?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8cb35cd7-65a1-4eb6-601e-08dc62cc1ad2
X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB5685.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2024 12:59:54.4206
 (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: iPuy+/5XAhyCCUqu40EEp+IM/iQqRMqkJ+6BhvAiiEf+0N91B3W2rvw/C0U0VgxV
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB7478

Am 22.04.24 um 14:33 schrieb Qiang Ma:
> On Mon, 22 Apr 2024 11:40:26 +0200
> Christian König <christian.koenig@amd.com> wrote:
>
>> 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.
>>
> Hi Christian:
> I see that two patches for this issue have been merged, and the
> patches are as follows:
>
> 11544d77e397 drm/amdgpu: fixup bad vram size on gmc v8
> 0ca223b029a2 drm/radeon: fixup bad vram size on SI

Mhm, I remember that we discussed reverting those but it looks like that 
never happened. I need to ask around internally.

Question is do you see any other problems with the board? E.g. incorrect 
connector or harvesting configuration?

Regards,
Christian.

>
> Qiang Ma
>
>>> 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);
>>