All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gurchetan Singh <gurchetansingh@chromium.org>
To: dri-devel@lists.freedesktop.org
Cc: kraxel@redhat.com
Subject: [PATCH v4 02/19] drm/virtio: blob prep: make CPU responses more generic
Date: Wed, 23 Sep 2020 17:31:57 -0700	[thread overview]
Message-ID: <20200924003214.662-2-gurchetansingh@chromium.org> (raw)
In-Reply-To: <20200924003214.662-1-gurchetansingh@chromium.org>

RESOURCE_MAP_BLOB / RESOURCE_UNMAP_BLOB can use this.

Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>
Acked-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
 drivers/gpu/drm/virtio/virtgpu_drv.h   |  6 +++---
 drivers/gpu/drm/virtio/virtgpu_prime.c |  6 +++---
 drivers/gpu/drm/virtio/virtgpu_vq.c    | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 55c34b4fc3e99..272abe177ded6 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -49,9 +49,9 @@
 #define DRIVER_MINOR 1
 #define DRIVER_PATCHLEVEL 0
 
-#define UUID_INITIALIZING 0
-#define UUID_INITIALIZED 1
-#define UUID_INITIALIZATION_FAILED 2
+#define STATE_INITIALIZING 0
+#define STATE_OK 1
+#define STATE_ERR 2
 
 struct virtio_gpu_object_params {
 	uint32_t format;
diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c
index acd14ef73d563..3552db128ba3d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_prime.c
+++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
@@ -34,8 +34,8 @@ static int virtgpu_virtio_get_uuid(struct dma_buf *buf,
 	struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj);
 	struct virtio_gpu_device *vgdev = obj->dev->dev_private;
 
-	wait_event(vgdev->resp_wq, bo->uuid_state != UUID_INITIALIZING);
-	if (bo->uuid_state != UUID_INITIALIZED)
+	wait_event(vgdev->resp_wq, bo->uuid_state != STATE_INITIALIZING);
+	if (bo->uuid_state != STATE_OK)
 		return -ENODEV;
 
 	uuid_copy(uuid, &bo->uuid);
@@ -81,7 +81,7 @@ struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj,
 			return ERR_PTR(ret);
 		virtio_gpu_notify(vgdev);
 	} else {
-		bo->uuid_state = UUID_INITIALIZATION_FAILED;
+		bo->uuid_state = STATE_ERR;
 	}
 
 	exp_info.ops = &virtgpu_dmabuf_ops.ops;
diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index a7550044b8b2e..55529ed97d9c7 100644
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -1127,14 +1127,14 @@ static void virtio_gpu_cmd_resource_uuid_cb(struct virtio_gpu_device *vgdev,
 	uint32_t resp_type = le32_to_cpu(resp->hdr.type);
 
 	spin_lock(&vgdev->resource_export_lock);
-	WARN_ON(obj->uuid_state != UUID_INITIALIZING);
+	WARN_ON(obj->uuid_state != STATE_INITIALIZING);
 
 	if (resp_type == VIRTIO_GPU_RESP_OK_RESOURCE_UUID &&
-	    obj->uuid_state == UUID_INITIALIZING) {
+	    obj->uuid_state == STATE_INITIALIZING) {
 		memcpy(&obj->uuid.b, resp->uuid, sizeof(obj->uuid.b));
-		obj->uuid_state = UUID_INITIALIZED;
+		obj->uuid_state = STATE_OK;
 	} else {
-		obj->uuid_state = UUID_INITIALIZATION_FAILED;
+		obj->uuid_state = STATE_ERR;
 	}
 	spin_unlock(&vgdev->resource_export_lock);
 
@@ -1153,7 +1153,7 @@ virtio_gpu_cmd_resource_assign_uuid(struct virtio_gpu_device *vgdev,
 	resp_buf = kzalloc(sizeof(*resp_buf), GFP_KERNEL);
 	if (!resp_buf) {
 		spin_lock(&vgdev->resource_export_lock);
-		bo->uuid_state = UUID_INITIALIZATION_FAILED;
+		bo->uuid_state = STATE_ERR;
 		spin_unlock(&vgdev->resource_export_lock);
 		virtio_gpu_array_put_free(objs);
 		return -ENOMEM;
-- 
2.26.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2020-09-24  0:32 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-24  0:31 [PATCH v4 01/19] drm/virtio: blob prep: refactor getting pages and attaching backing Gurchetan Singh
2020-09-24  0:31 ` Gurchetan Singh [this message]
2020-09-24  0:31 ` [PATCH v4 03/19] virtio-gpu api: blob resources Gurchetan Singh
2020-09-24  0:31 ` [PATCH v4 04/19] virtio-gpu api: host visible feature Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 05/19] drm/virtgpu api: blob resources Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 06/19] drm/virtgpu api: host visible feature Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 07/19] drm/virtgpu api: cross-device feature Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 08/19] drm/virtio: implement blob resources: probe for the feature Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 09/19] drm/virtio: implement blob resources: probe for host visible region Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 10/19] drm/virtio: implement blob resources: expose virtio_gpu_resource_id_get Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 11/19] drm/virtio: implement blob resources: add new fields to internal structs Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 12/19] drm/virtio: implement blob resources: implement vram object Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 13/19] drm/virtio: implement blob resources: hypercall interface Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 14/19] drm/virtio: implement blob resources: blob display integration Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 15/19] drm/virtio: implement blob resources: refactor UUID code somewhat Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 16/19] drm/virtio: implement blob resources: fix stride discrepancy Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 17/19] drm/virtio: implement blob resources: report blob mem to userspace Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 18/19] drm/virtio: implement blob resources: resource create blob ioctl Gurchetan Singh
2020-09-24  0:32 ` [PATCH v4 19/19] drm/virtio: advertise features to userspace Gurchetan Singh
2020-09-29  9:32 ` [PATCH v4 01/19] drm/virtio: blob prep: refactor getting pages and attaching backing Gerd Hoffmann
2020-09-29 21:56   ` Gurchetan Singh

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=20200924003214.662-2-gurchetansingh@chromium.org \
    --to=gurchetansingh@chromium.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=kraxel@redhat.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.