Received-SPF: pass (google.com: domain of linux-kernel+bounces-42767-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <cab2246a-5ed8-4651-999f-260c1c4275ad@amd.com>
Date: Mon, 29 Jan 2024 14:12:19 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v2 1/1] drm/virtio: Implement device_attach
Content-Language: en-US
To: Julia Zhang <julia.zhang@amd.com>,
 Gurchetan Singh <gurchetansingh@chromium.org>, Chia-I Wu
 <olvaffe@gmail.com>, David Airlie <airlied@redhat.com>,
 Gerd Hoffmann <kraxel@redhat.com>, linux-kernel@vger.kernel.org,
 dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org,
 virtualization@lists.linux-foundation.org
Cc: Alex Deucher <alexander.deucher@amd.com>, Daniel Vetter
 <daniel@ffwll.ch>, David Airlie <airlied@gmail.com>,
 Erik Faye-Lund <kusmabite@gmail.com>, =?UTF-8?B?TWFyZWsgT2zFocOhaw==?=
 <marek.olsak@amd.com>,
 Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>,
 Honglei Huang <honglei1.huang@amd.com>, Chen Jiqian <Jiqian.Chen@amd.com>,
 Huang Rui <ray.huang@amd.com>
References: <20240129103118.3258781-1-julia.zhang@amd.com>
From: =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>
In-Reply-To: <20240129103118.3258781-1-julia.zhang@amd.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?NVNFai9FdE1GNWpTdW1KZFA1U2wwaXFFbUpLa2tiYnEzWDFBVThBbkJubjQy?=
 =?utf-8?B?UDJPMlQxbis2aEIzM2M2K2UrYzUybE4yeVBUVXkzTUh0cU1rL2ZGUkUrVE5I?=
 =?utf-8?B?VGpUK3JvWlNYY1BJMU5TL01mQWl3WkdRbzdWRGg4L0NyU3RwSEdFZUlSeGdn?=
 =?utf-8?B?eTJ5ZzZrTkJmZlVvWlBacVVEbnN1Yi9wY3VCcnNJZ0tpc2NFMmJCeTFvZkJM?=
 =?utf-8?B?UUMyS0RHa2RKMG16cFBndE1FdDdwS3krYW1EVEV6VVdLM3VBZ1hOTDRNWS9h?=
 =?utf-8?B?Rk40ZVRQb0JHdFg2MjRmd0tXRUgxaXdnZmhJcW0wQWVFRVZBem9FYXRZRERI?=
 =?utf-8?B?bGwwSjdBeExDbHNZa2w3eGFvS0M2REZ6RVZWVlBweWNFcHdFVWplLytrbmRn?=
 =?utf-8?B?OFhxTGJWOGR2UkpGS3d6RXRYckFWK2pMWkRiZUpLa2xzRTVrS1gzemdBYW02?=
 =?utf-8?B?WWs0Y01Zd3pPN1lDcDlmUkV2Sys0Z3hyVUcwelJ1djRvQWxyOXNGVkdjUE5D?=
 =?utf-8?B?UERKV1NpMHluc0U3UHJlOEJGcXIwbW1BNnhVUjExY1FTMlBkTW9kSE1SRFZM?=
 =?utf-8?B?MG1EVjUyTlBhbURUcjJLWS9hSWMxOGYwOVY2M2syM2RZeElxNEUxeWxuVFk2?=
 =?utf-8?B?cTFOWk9RUndlcE1jVkwzZldYN1JsNG95Q1V2eUMwSjgzTWhGOFdYWTFrS2R6?=
 =?utf-8?B?RU5MTWtUS24rTXBrc20zcUZFYnlBQnFlUGEvUmpXUDJCV0tCZGdDcHhrZWM5?=
 =?utf-8?B?cDBMUW00NWZhOXgwQklKQUZDM2prcUREbGtBNUExQ0lYY0ZaUUdvU3ZZcmZz?=
 =?utf-8?B?TDNVbDFzWUM0YXJicWVvTktmZDVoUFhkQU9KRHhBR2gwK2tBQTJYRXdVU1hE?=
 =?utf-8?B?R1FUSG1WSmVUdzNoSEJLbE05byt1M3FodkdKSE5aSE5zZVNsdzJ6OGV4cWcy?=
 =?utf-8?B?b1VOSDhRZFFCZmo2dFo5a0JxdE5nd3F1aWs3VVR5N2hSTjVWNjRuTk5jK0V5?=
 =?utf-8?B?VkZLbmxUbWlNSEoxRXJqR0t4VXpHamJ2SkIrNHlKUnRNV1JCTW9zUFFlcUlq?=
 =?utf-8?B?bFNEYzZrZXVmWStJWGg3UTJLRmhlYWtPaUxOcUFwd2J3UWN4NDBrVnJEUTIw?=
 =?utf-8?B?bWptL08yOGdoWGdBWjFKWE9LNXhRMzVtYW9vckE1UFJaamtUZTBJSDA3SkFl?=
 =?utf-8?B?dTA2WldNbDZHdFIrSmIxUXdHRzdBaFo1eUxibTMrWGlpeU1WYWxaSGpIOSt0?=
 =?utf-8?B?Z0JDOHJpZG1rRGJIbHZVaTI4LzJIT0QvaDlnMjgzR21yd1Q0TmlhWlFCYks4?=
 =?utf-8?B?NjlzQUNkODhjampJckV5bUtadFA4NU0wNzR5STdQUVdwVkpRZm54bnBGWGJP?=
 =?utf-8?B?R2l3UVlwYUhRb0VxWTJ5MEdZM0daZ3UwSXhUOXpTZllvK0N4c281TnhDVmNj?=
 =?utf-8?B?RG50RWo4eEd1RElsUjVtSGdIb1RvNHY5TnoxR3lMeFhROTQzbmV2MjZWd0pE?=
 =?utf-8?B?NndFMktuNklwV0o5VmFZSW9Nb01sSk1NMVd2V2dseTBqOEFrSloxeGlaamZJ?=
 =?utf-8?B?cUJENWE1L1IyZ09naHJwaU1ncEg2Q2RnbzhMUi9DbEhHZlVqQzYzV2NuSC81?=
 =?utf-8?B?U0ZyWEVWejFFaDloUlpqOE5zQ3ZnR2NPclNKWUtZRkN0RTdTak9vaURPOWpa?=
 =?utf-8?B?VmR3WEh0UWFtZXZWOUJkWSt0VDBVemp5ZTlWZlZOenBMdjFWcHJteWZZMTBn?=
 =?utf-8?B?T1BrSGhoZUhoS1FMRHZUMXdpRDJ2ZmJRRmticFB6WmtjMVVOVWxSZE1ucjcy?=
 =?utf-8?B?Um1kMHNDRTRKY2xJN01nVVNZeExhZXVZeUpseGcveCtISVROSGRrYzNQWFNP?=
 =?utf-8?B?VTBKVDNmcFlJV2hqTTlaMWpSMFVOcCtXTFNIUFExbXd1SXV3bmlrcVFPMGJj?=
 =?utf-8?B?bytKWkpiZHpaWUpmcnNWRzljeFZhZWQvQmxLRU5IMThrNlNKU3c1L3JHcGhm?=
 =?utf-8?B?RmwzWlRKSzFwTTRhYW14bGFRY2FaYTdsQ3p0MlFMSW9VSFNuZHNXUEpzRVNF?=
 =?utf-8?B?TEtPZitGSnlFOWl6NlhSYVA2N3IvcTcyZ0E2TW1kaXpvcnh5dkR2YTZsa01s?=
 =?utf-8?Q?6+W+1iJRyM6GUmXVHURNDrn+1?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 392fd4b7-5b73-40f1-62a9-08dc20cbf0ef
X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB5685.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2024 13:12:27.4961
 (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: aLDDj74CSMEKjgnrg8sfpEbGoYi1bHS4+R5anCwno6YJGEbVIc7DprFdK+Z0ph5z
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB5434

Am 29.01.24 um 11:31 schrieb Julia Zhang:
> As vram objects don't have backing pages and thus can't implement
> drm_gem_object_funcs.get_sg_table callback. This removes drm dma-buf
> callbacks in virtgpu_gem_map_dma_buf()/virtgpu_gem_unmap_dma_buf()
> and implement virtgpu specific map/unmap/attach callbacks to support
> both of shmem objects and vram objects.
>
> Signed-off-by: Julia Zhang <julia.zhang@amd.com>

I need to find more time to look into the code, but of hand I would say 
that this is the correct solution.

Regards,
Christian.

> ---
>   drivers/gpu/drm/virtio/virtgpu_prime.c | 40 +++++++++++++++++++++++---
>   1 file changed, 36 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c
> index 44425f20d91a..b490a5343b06 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_prime.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
> @@ -49,11 +49,26 @@ virtgpu_gem_map_dma_buf(struct dma_buf_attachment *attach,
>   {
>   	struct drm_gem_object *obj = attach->dmabuf->priv;
>   	struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj);
> +	struct sg_table *sgt;
> +	int ret;
>   
>   	if (virtio_gpu_is_vram(bo))
>   		return virtio_gpu_vram_map_dma_buf(bo, attach->dev, dir);
>   
> -	return drm_gem_map_dma_buf(attach, dir);
> +	sgt = drm_prime_pages_to_sg(obj->dev,
> +				    to_drm_gem_shmem_obj(obj)->pages,
> +				    obj->size >> PAGE_SHIFT);
> +	if (IS_ERR(sgt))
> +		return sgt;
> +
> +	ret = dma_map_sgtable(attach->dev, sgt, dir, DMA_ATTR_SKIP_CPU_SYNC);
> +	if (ret) {
> +		sg_free_table(sgt);
> +		kfree(sgt);
> +		return ERR_PTR(ret);
> +	}
> +
> +	return sgt;
>   }
>   
>   static void virtgpu_gem_unmap_dma_buf(struct dma_buf_attachment *attach,
> @@ -63,12 +78,29 @@ static void virtgpu_gem_unmap_dma_buf(struct dma_buf_attachment *attach,
>   	struct drm_gem_object *obj = attach->dmabuf->priv;
>   	struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj);
>   
> +	if (!sgt)
> +		return;
> +
>   	if (virtio_gpu_is_vram(bo)) {
>   		virtio_gpu_vram_unmap_dma_buf(attach->dev, sgt, dir);
> -		return;
> +	} else {
> +		dma_unmap_sgtable(attach->dev, sgt, dir, DMA_ATTR_SKIP_CPU_SYNC);
> +		sg_free_table(sgt);
> +		kfree(sgt);
>   	}
> +}
> +
> +static int virtgpu_gem_device_attach(struct dma_buf *dma_buf,
> +				     struct dma_buf_attachment *attach)
> +{
> +	struct drm_gem_object *obj = attach->dmabuf->priv;
> +	struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj);
> +	int ret = 0;
> +
> +	if (!virtio_gpu_is_vram(bo) && obj->funcs->pin)
> +		ret = obj->funcs->pin(obj);
>   
> -	drm_gem_unmap_dma_buf(attach, sgt, dir);
> +	return ret;
>   }
>   
>   static const struct virtio_dma_buf_ops virtgpu_dmabuf_ops =  {
> @@ -83,7 +115,7 @@ static const struct virtio_dma_buf_ops virtgpu_dmabuf_ops =  {
>   		.vmap = drm_gem_dmabuf_vmap,
>   		.vunmap = drm_gem_dmabuf_vunmap,
>   	},
> -	.device_attach = drm_gem_map_attach,
> +	.device_attach = virtgpu_gem_device_attach,
>   	.get_uuid = virtgpu_virtio_get_uuid,
>   };
>