[PATCH] drm/amdgpu: Change the way to determine framebuffer type

[PATCH] drm/amdgpu: Change the way to determine framebuffer type

[Gang Ba]

Determine FRAMEBUFFER_PUBLIC/PRIVATE only based host-accessibility,
not peer-accesssibility

Signed-off-by: Gang Ba <gaba@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 5aa7dbaf6e76..f066696338d7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -390,23 +390,17 @@ void amdgpu_amdkfd_get_local_mem_info(struct kgd_dev *kgd,
 				      struct kfd_local_mem_info *mem_info)
 {
 	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
-	uint64_t address_mask = adev->dev->dma_mask ? ~*adev->dev->dma_mask :
-					     ~((1ULL << 32) - 1);
-	resource_size_t aper_limit = adev->gmc.aper_base + adev->gmc.aper_size;
 
 	memset(mem_info, 0, sizeof(*mem_info));
-	if (!(adev->gmc.aper_base & address_mask || aper_limit & address_mask)) {
-		mem_info->local_mem_size_public = adev->gmc.visible_vram_size;
-		mem_info->local_mem_size_private = adev->gmc.real_vram_size -
-				adev->gmc.visible_vram_size;
-	} else {
-		mem_info->local_mem_size_public = 0;
-		mem_info->local_mem_size_private = adev->gmc.real_vram_size;
-	}
+
+	mem_info->local_mem_size_public = adev->gmc.visible_vram_size;
+	mem_info->local_mem_size_private = adev->gmc.real_vram_size -
+						adev->gmc.visible_vram_size;
+
 	mem_info->vram_width = adev->gmc.vram_width;
 
-	pr_debug("Address base: %pap limit %pap public 0x%llx private 0x%llx\n",
-			&adev->gmc.aper_base, &aper_limit,
+	pr_debug("Address base: %pap public 0x%llx private 0x%llx\n",
+			&adev->gmc.aper_base,
 			mem_info->local_mem_size_public,
 			mem_info->local_mem_size_private);
 
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: Change the way to determine framebuffer type

[Felix Kuehling]

Am 2020-10-08 um 1:15 p.m. schrieb Gang Ba:
> Determine FRAMEBUFFER_PUBLIC/PRIVATE only based host-accessibility,
> not peer-accesssibility
>
> Signed-off-by: Gang Ba <gaba@amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>


> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 20 +++++++-------------
>  1 file changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index 5aa7dbaf6e76..f066696338d7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> @@ -390,23 +390,17 @@ void amdgpu_amdkfd_get_local_mem_info(struct kgd_dev *kgd,
>  				      struct kfd_local_mem_info *mem_info)
>  {
>  	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
> -	uint64_t address_mask = adev->dev->dma_mask ? ~*adev->dev->dma_mask :
> -					     ~((1ULL << 32) - 1);
> -	resource_size_t aper_limit = adev->gmc.aper_base + adev->gmc.aper_size;
>  
>  	memset(mem_info, 0, sizeof(*mem_info));
> -	if (!(adev->gmc.aper_base & address_mask || aper_limit & address_mask)) {
> -		mem_info->local_mem_size_public = adev->gmc.visible_vram_size;
> -		mem_info->local_mem_size_private = adev->gmc.real_vram_size -
> -				adev->gmc.visible_vram_size;
> -	} else {
> -		mem_info->local_mem_size_public = 0;
> -		mem_info->local_mem_size_private = adev->gmc.real_vram_size;
> -	}
> +
> +	mem_info->local_mem_size_public = adev->gmc.visible_vram_size;
> +	mem_info->local_mem_size_private = adev->gmc.real_vram_size -
> +						adev->gmc.visible_vram_size;
> +
>  	mem_info->vram_width = adev->gmc.vram_width;
>  
> -	pr_debug("Address base: %pap limit %pap public 0x%llx private 0x%llx\n",
> -			&adev->gmc.aper_base, &aper_limit,
> +	pr_debug("Address base: %pap public 0x%llx private 0x%llx\n",
> +			&adev->gmc.aper_base,
>  			mem_info->local_mem_size_public,
>  			mem_info->local_mem_size_private);
>  
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx