Re: [PATCH 1/3] drm/virtio: virtio_{blah} --> virtio_gpu_{blah}

On Mon, Nov 23, 2020 at 06:19:00PM -0800, Gurchetan Singh wrote:

virtio_gpu typically uses the prefix virtio_gpu, but there are a few places where the virtio prefix is used. Modify this for consistency.

Signed-off-by: Gurchetan Singh gurchetansingh@chromium.org

Reviewed-by: Anthoine Bourgeois anthoine.bourgeois@gmail.com

---

drivers/gpu/drm/virtio/virtgpu_debugfs.c | 24 ++++++++++-------- drivers/gpu/drm/virtio/virtgpu_fence.c | 32 +++++++++++++----------- 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_debugfs.c b/drivers/gpu/drm/virtio/virtgpu_debugfs.c index 5fefc88d47e4..c2b20e0ee030 100644 --- a/drivers/gpu/drm/virtio/virtgpu_debugfs.c +++ b/drivers/gpu/drm/virtio/virtgpu_debugfs.c @@ -28,14 +28,13 @@

#include "virtgpu_drv.h"

-static void virtio_add_bool(struct seq_file *m, const char *name,

• 		    bool value)
  

+static void virtio_gpu_add_bool(struct seq_file *m, const char *name,

• 		bool value)
  

{ seq_printf(m, "%-16s : %s\n", name, value ? "yes" : "no"); }

-static void virtio_add_int(struct seq_file *m, const char *name,

• 		   int value)
  

+static void virtio_gpu_add_int(struct seq_file *m, const char *name, int value) { seq_printf(m, "%-16s : %d\n", name, value); } @@ -45,13 +44,16 @@ static int virtio_gpu_features(struct seq_file *m, void *data) struct drm_info_node *node = (struct drm_info_node *)m->private; struct virtio_gpu_device *vgdev = node->minor->dev->dev_private;

• virtio_add_bool(m, "virgl", vgdev->has_virgl_3d);
• virtio_add_bool(m, "edid", vgdev->has_edid);
• virtio_add_bool(m, "indirect", vgdev->has_indirect);
• virtio_add_bool(m, "resource uuid", vgdev->has_resource_assign_uuid);
• virtio_add_bool(m, "blob resources", vgdev->has_resource_blob);
• virtio_add_int(m, "cap sets", vgdev->num_capsets);
• virtio_add_int(m, "scanouts", vgdev->num_scanouts);

• virtio_gpu_add_bool(m, "virgl", vgdev->has_virgl_3d);
• virtio_gpu_add_bool(m, "edid", vgdev->has_edid);
• virtio_gpu_add_bool(m, "indirect", vgdev->has_indirect);
• virtio_gpu_add_bool(m, "resource uuid",

• 	    vgdev->has_resource_assign_uuid);
  

• virtio_gpu_add_bool(m, "blob resources", vgdev->has_resource_blob);
• virtio_gpu_add_int(m, "cap sets", vgdev->num_capsets);
• virtio_gpu_add_int(m, "scanouts", vgdev->num_scanouts); if (vgdev->host_visible_region.len) { seq_printf(m, "%-16s : 0x%lx +0x%lx\n", "host visible region", (unsigned long)vgdev->host_visible_region.addr,

diff --git a/drivers/gpu/drm/virtio/virtgpu_fence.c b/drivers/gpu/drm/virtio/virtgpu_fence.c index 728ca36f6327..586034c90587 100644 --- a/drivers/gpu/drm/virtio/virtgpu_fence.c +++ b/drivers/gpu/drm/virtio/virtgpu_fence.c @@ -27,22 +27,22 @@

#include "virtgpu_drv.h"

-#define to_virtio_fence(x) \ +#define to_virtio_gpu_fence(x) \ container_of(x, struct virtio_gpu_fence, f)

-static const char *virtio_get_driver_name(struct dma_fence *f) +static const char *virtio_gpu_get_driver_name(struct dma_fence *f) { return "virtio_gpu"; }

-static const char *virtio_get_timeline_name(struct dma_fence *f) +static const char *virtio_gpu_get_timeline_name(struct dma_fence *f) { return "controlq"; }

-static bool virtio_fence_signaled(struct dma_fence *f) +static bool virtio_gpu_fence_signaled(struct dma_fence *f) {

• struct virtio_gpu_fence *fence = to_virtio_fence(f);

• struct virtio_gpu_fence *fence = to_virtio_gpu_fence(f);

  if (WARN_ON_ONCE(fence->f.seqno == 0)) /* leaked fence outside driver before completing

@@ -53,25 +53,26 @@ static bool virtio_fence_signaled(struct dma_fence *f) return false; }

-static void virtio_fence_value_str(struct dma_fence *f, char *str, int size) +static void virtio_gpu_fence_value_str(struct dma_fence *f, char *str, int size) { snprintf(str, size, "%llu", f->seqno); }

-static void virtio_timeline_value_str(struct dma_fence *f, char *str, int size) +static void virtio_gpu_timeline_value_str(struct dma_fence *f, char *str,

• 			  int size)
  

{

• struct virtio_gpu_fence *fence = to_virtio_fence(f);

• struct virtio_gpu_fence *fence = to_virtio_gpu_fence(f);

  snprintf(str, size, "%llu", (u64)atomic64_read(&fence->drv->last_fence_id));

}

-static const struct dma_fence_ops virtio_fence_ops = {

• .get_driver_name = virtio_get_driver_name,
• .get_timeline_name = virtio_get_timeline_name,
• .signaled = virtio_fence_signaled,
• .fence_value_str = virtio_fence_value_str,
• .timeline_value_str = virtio_timeline_value_str,

+static const struct dma_fence_ops virtio_gpu_fence_ops = {

• .get_driver_name = virtio_gpu_get_driver_name,
• .get_timeline_name = virtio_gpu_get_timeline_name,
• .signaled = virtio_gpu_fence_signaled,
• .fence_value_str = virtio_gpu_fence_value_str,
• .timeline_value_str = virtio_gpu_timeline_value_str,

};

struct virtio_gpu_fence *virtio_gpu_fence_alloc(struct virtio_gpu_device *vgdev) @@ -88,7 +89,8 @@ struct virtio_gpu_fence *virtio_gpu_fence_alloc(struct virtio_gpu_device *vgdev) * unknown yet. The fence must not be used outside of the driver * until virtio_gpu_fence_emit is called. */

• dma_fence_init(&fence->f, &virtio_fence_ops, &drv->lock, drv->context, 0);

• dma_fence_init(&fence->f, &virtio_gpu_fence_ops, &drv->lock, drv->context,

•        0);
  
  

  return fence;

}

2.29.2.454.gaff20da3a2-goog

---

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