From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63121C169C4 for ; Thu, 31 Jan 2019 10:47:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 260EC218DA for ; Thu, 31 Jan 2019 10:47:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=tronnes.org header.i=@tronnes.org header.b="MQrH/j/T" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732173AbfAaKrq (ORCPT ); Thu, 31 Jan 2019 05:47:46 -0500 Received: from smtp.domeneshop.no ([194.63.252.55]:46554 "EHLO smtp.domeneshop.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725766AbfAaKrq (ORCPT ); Thu, 31 Jan 2019 05:47:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tronnes.org; s=ds201810; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To:Subject; bh=psPKiR4qcw3FV2KUeSkw0WnRxB6bSvZ4S9WD8ziuXhI=; b=MQrH/j/TVU+Uqvva1MRtSE5aytXOudLYU3x50Pb8MmXKc1VwwEo6sVOOgdyzRIHen/JWBYPdT7RsIyo6LLm6+176B+d5Fj5omGl21HqFEbPlGSJ3R0Wy8dLSlo8kYHixu56ssCpXYo6p01J9f0LYDQeDYPRJJFIvyYlPLv4hvd+AAPpg6wPyq3xJ1QbbakPWTon+Y+SGadL5WcgRkzkMB/HdhRq+ZaMJvVz+XhEnfiGqWfIHfU50RCDgqj8KOEQ4YP+4/D3XnYqoeHs5T+lJuXhiOCzYO3QFndZcAmaV7vfhRSD1bHskFOUvhHlelUmhEhrQBsUbjGt7Mh0Pql99bw==; Received: from 211.81-166-168.customer.lyse.net ([81.166.168.211]:52651 helo=[192.168.10.176]) by smtp.domeneshop.no with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1gp9si-0005kY-OA; Thu, 31 Jan 2019 11:47:40 +0100 Subject: Re: [PATCH v2 4/6] drm/virtio: params struct for virtio_gpu_cmd_create_resource_3d() To: Gerd Hoffmann , dri-devel@lists.freedesktop.org Cc: David Airlie , open list , "open list:VIRTIO GPU DRIVER" References: <20190130094338.14203-1-kraxel@redhat.com> <20190130094338.14203-5-kraxel@redhat.com> From: =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= Message-ID: <4d3064ef-9993-106a-74b5-73a29c08975e@tronnes.org> Date: Thu, 31 Jan 2019 11:47:38 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 MIME-Version: 1.0 In-Reply-To: <20190130094338.14203-5-kraxel@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Den 30.01.2019 10.43, skrev Gerd Hoffmann: > Add 3d resource parameters to virtio_gpu_object_params struct. With > that in place we can use it for virtio_gpu_cmd_resource_create_3d() > calls. > > Signed-off-by: Gerd Hoffmann > --- You don't remove the struct virtio_gpu_resource_create_3d definition, but it looks like there's no users left? Noralf. > drivers/gpu/drm/virtio/virtgpu_drv.h | 10 +++++++++- > drivers/gpu/drm/virtio/virtgpu_ioctl.c | 25 ++++++++++--------------- > drivers/gpu/drm/virtio/virtgpu_vq.c | 16 +++++++++++++--- > 3 files changed, 32 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h > index a40215c10e..3265e62725 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.h > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h > @@ -56,6 +56,14 @@ struct virtio_gpu_object_params { > uint32_t height; > unsigned long size; > bool pinned; > + /* 3d */ > + uint32_t target; > + uint32_t bind; > + uint32_t depth; > + uint32_t array_size; > + uint32_t last_level; > + uint32_t nr_samples; > + uint32_t flags; > }; > > struct virtio_gpu_object { > @@ -310,7 +318,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, > void > virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, > struct virtio_gpu_object *bo, > - struct virtio_gpu_resource_create_3d *rc_3d); > + struct virtio_gpu_object_params *params); > void virtio_gpu_ctrl_ack(struct virtqueue *vq); > void virtio_gpu_cursor_ack(struct virtqueue *vq); > void virtio_gpu_fence_ack(struct virtqueue *vq); > diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c > index 84c2216fd4..431e5d767e 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c > +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c > @@ -283,7 +283,6 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, > struct ttm_validate_buffer mainbuf; > struct virtio_gpu_fence *fence = NULL; > struct ww_acquire_ctx ticket; > - struct virtio_gpu_resource_create_3d rc_3d; > struct virtio_gpu_object_params params = { 0 }; > > if (vgdev->has_virgl_3d == false) { > @@ -307,7 +306,15 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, > params.width = rc->width; > params.height = rc->height; > params.size = rc->size; > - > + if (vgdev->has_virgl_3d) { > + params.target = rc->target; > + params.bind = rc->bind; > + params.depth = rc->depth; > + params.array_size = rc->array_size; > + params.last_level = rc->last_level; > + params.nr_samples = rc->nr_samples; > + params.flags = rc->flags; > + } > /* allocate a single page size object */ > if (params.size == 0) > params.size = PAGE_SIZE; > @@ -333,25 +340,13 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, > goto fail_unref; > } > > - rc_3d.resource_id = cpu_to_le32(qobj->hw_res_handle); > - rc_3d.target = cpu_to_le32(rc->target); > - rc_3d.format = cpu_to_le32(rc->format); > - rc_3d.bind = cpu_to_le32(rc->bind); > - rc_3d.width = cpu_to_le32(rc->width); > - rc_3d.height = cpu_to_le32(rc->height); > - rc_3d.depth = cpu_to_le32(rc->depth); > - rc_3d.array_size = cpu_to_le32(rc->array_size); > - rc_3d.last_level = cpu_to_le32(rc->last_level); > - rc_3d.nr_samples = cpu_to_le32(rc->nr_samples); > - rc_3d.flags = cpu_to_le32(rc->flags); > - > fence = virtio_gpu_fence_alloc(vgdev); > if (!fence) { > ret = -ENOMEM; > goto fail_backoff; > } > > - virtio_gpu_cmd_resource_create_3d(vgdev, qobj, &rc_3d); > + virtio_gpu_cmd_resource_create_3d(vgdev, qobj, ¶ms); > ret = virtio_gpu_object_attach(vgdev, qobj, fence); > if (ret) { > dma_fence_put(&fence->f); > diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c > index 363b8b8577..ca93ec6ca3 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_vq.c > +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c > @@ -826,7 +826,7 @@ void virtio_gpu_cmd_context_detach_resource(struct virtio_gpu_device *vgdev, > void > virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, > struct virtio_gpu_object *bo, > - struct virtio_gpu_resource_create_3d *rc_3d) > + struct virtio_gpu_object_params *params) > { > struct virtio_gpu_resource_create_3d *cmd_p; > struct virtio_gpu_vbuffer *vbuf; > @@ -834,9 +834,19 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, > cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p)); > memset(cmd_p, 0, sizeof(*cmd_p)); > > - *cmd_p = *rc_3d; > cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_RESOURCE_CREATE_3D); > - cmd_p->hdr.flags = 0; > + cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle); > + cmd_p->format = cpu_to_le32(params->format); > + cmd_p->width = cpu_to_le32(params->width); > + cmd_p->height = cpu_to_le32(params->height); > + > + cmd_p->target = cpu_to_le32(params->target); > + cmd_p->bind = cpu_to_le32(params->bind); > + cmd_p->depth = cpu_to_le32(params->depth); > + cmd_p->array_size = cpu_to_le32(params->array_size); > + cmd_p->last_level = cpu_to_le32(params->last_level); > + cmd_p->nr_samples = cpu_to_le32(params->nr_samples); > + cmd_p->flags = cpu_to_le32(params->flags); > > virtio_gpu_queue_ctrl_buffer(vgdev, vbuf); > bo->created = true; >