drm/amdgpu: Use GTT for dumb buffer if sg display enabled (v2)

[Christian König]

Am 23.05.2018 um 00:31 schrieb Deepak Sharma:
> When vram size <= THRESHOLD(256M) lets use GTT for dumb buffer
> allocation. As SG will be enabled with vram size <= 256M
> scan out will not be an issue.
>
> v2: Use amdgpu_display_supported_domains to get supported domain.
>
> Signed-off-by: Deepak Sharma <Deepak.Sharma at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 2c8e27370284..63758db5e2ea 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -30,6 +30,7 @@
>   #include <drm/drmP.h>
>   #include <drm/amdgpu_drm.h>
>   #include "amdgpu.h"
> +#include "amdgpu_display.h"
>   
>   void amdgpu_gem_object_free(struct drm_gem_object *gobj)
>   {
> @@ -749,15 +750,20 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
>   	struct amdgpu_device *adev = dev->dev_private;
>   	struct drm_gem_object *gobj;
>   	uint32_t handle;
> +	u32 domain = amdgpu_display_supported_domains(adev);
>   	int r;
>   
>   	args->pitch = amdgpu_align_pitch(adev, args->width,
>   					 DIV_ROUND_UP(args->bpp, 8), 0);
>   	args->size = (u64)args->pitch * args->height;
>   	args->size = ALIGN(args->size, PAGE_SIZE);
> +	if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> +		domain = AMDGPU_GEM_DOMAIN_VRAM;
> +		if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> +			domain = AMDGPU_GEM_DOMAIN_GTT;
> +	}

As Michel suggested as well better make that an helper in amdgpu_object.c.

Apart from that looks good to me,
Christian.

>   
> -	r = amdgpu_gem_object_create(adev, args->size, 0,
> -				     AMDGPU_GEM_DOMAIN_VRAM,
> +	r = amdgpu_gem_object_create(adev, args->size, 0, domain,
>   				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
>   				     false, NULL, &gobj);
>   	if (r)