From: Gerd Hoffmann <kraxel@redhat.com>
To: dri-devel@lists.freedesktop.org, David Airlie <airlied@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>,
David Airlie <airlied@linux.ie>,
virtualization@lists.linux-foundation.org (open list:VIRTIO GPU
DRIVER), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 10/10] drm/virtio: ditch virtio_gpu_object_attach() calls
Date: Wed, 19 Dec 2018 13:27:08 +0100 [thread overview]
Message-ID: <20181219122708.4586-11-kraxel@redhat.com> (raw)
In-Reply-To: <20181219122708.4586-1-kraxel@redhat.com>
With virtio_gpu_object_create() being called earlier ttm_bo_init() will
handle the virtio_gpu_object_attach() (via backend binding), so we can
drop the extra calls now.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/gpu/drm/virtio/virtgpu_gem.c | 9 ---------
drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 --
2 files changed, 11 deletions(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c
index ca84990382..4b01e5655c 100644
--- a/drivers/gpu/drm/virtio/virtgpu_gem.c
+++ b/drivers/gpu/drm/virtio/virtgpu_gem.c
@@ -82,9 +82,7 @@ int virtio_gpu_mode_dumb_create(struct drm_file *file_priv,
struct drm_device *dev,
struct drm_mode_create_dumb *args)
{
- struct virtio_gpu_device *vgdev = dev->dev_private;
struct drm_gem_object *gobj;
- struct virtio_gpu_object *obj;
struct virtio_gpu_object_params params = {
.pinned = false,
};
@@ -108,13 +106,6 @@ int virtio_gpu_mode_dumb_create(struct drm_file *file_priv,
if (ret)
goto fail;
- obj = gem_to_virtio_gpu_obj(gobj);
-
- /* attach the object to the resource */
- ret = virtio_gpu_object_attach(vgdev, obj, NULL);
- if (ret)
- goto fail;
-
args->pitch = pitch;
return ret;
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index e5bd1fed56..90b3955b6f 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -319,8 +319,6 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
return PTR_ERR(qobj);
obj = &qobj->gem_base;
- ret = virtio_gpu_object_attach(vgdev, qobj, NULL);
-
ret = drm_gem_handle_create(file_priv, obj, &handle);
if (ret) {
drm_gem_object_release(obj);
--
2.9.3
prev parent reply other threads:[~2018-12-19 12:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20181219122708.4586-1-kraxel@redhat.com>
2018-12-19 12:26 ` [PATCH 01/10] drm/virtio: log error responses Gerd Hoffmann
2018-12-21 9:59 ` Oleksandr Andrushchenko
2018-12-19 12:27 ` [PATCH 02/10] drm/virtio: fix pageflip flush Gerd Hoffmann
2019-01-02 17:09 ` Ezequiel Garcia
2018-12-19 12:27 ` [PATCH 03/10] drm/virtio: drop virtio_gpu_fence_cleanup() Gerd Hoffmann
2019-01-02 17:10 ` Ezequiel Garcia
2018-12-19 12:27 ` [PATCH 04/10] drm/virtio: move virtio_gpu_object_{attach,detach} calls Gerd Hoffmann
2018-12-19 12:27 ` [PATCH 05/10] drm/virtio: use struct to pass params to virtio_gpu_object_create() Gerd Hoffmann
2019-01-02 17:12 ` Ezequiel Garcia
2018-12-19 12:27 ` [PATCH 06/10] drm/virtio: params struct for virtio_gpu_cmd_create_resource() Gerd Hoffmann
2018-12-19 12:27 ` [PATCH 07/10] drm/virtio: params struct for virtio_gpu_cmd_create_resource_3d() Gerd Hoffmann
2018-12-19 12:27 ` [PATCH 08/10] drm/virtio: drop fencing in virtio_gpu_resource_create_ioctl Gerd Hoffmann
2018-12-19 12:27 ` [PATCH 09/10] drm/virtio: move virtio_gpu_cmd_create_resource call into virtio_gpu_object_create Gerd Hoffmann
2018-12-19 12:27 ` Gerd Hoffmann [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181219122708.4586-11-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).