[PATCH v2 4/7] drm/virtio: implement userptr: probe for the feature

[Honglei Huang]

From: Honglei Huang <honglei1.hu...@amd.com>

Add probe code path for virtio gpu userptr.

Signed-off-by: Honglei Huang <honglei1.hu...@amd.com>
---
 drivers/gpu/drm/virtio/virtgpu_debugfs.c | 1 +
 drivers/gpu/drm/virtio/virtgpu_drv.c     | 1 +
 drivers/gpu/drm/virtio/virtgpu_drv.h     | 1 +
 drivers/gpu/drm/virtio/virtgpu_kms.c     | 8 ++++++--
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_debugfs.c 
b/drivers/gpu/drm/virtio/virtgpu_debugfs.c
index 853dd9aa397e..da9fa034db0e 100644
--- a/drivers/gpu/drm/virtio/virtgpu_debugfs.c
+++ b/drivers/gpu/drm/virtio/virtgpu_debugfs.c
@@ -57,6 +57,7 @@ static int virtio_gpu_features(struct seq_file *m, void *data)
        virtio_gpu_add_bool(m, "context init", vgdev->has_context_init);
        virtio_gpu_add_int(m, "cap sets", vgdev->num_capsets);
        virtio_gpu_add_int(m, "scanouts", vgdev->num_scanouts);
+       virtio_gpu_add_int(m, "blob userptr", vgdev->has_resource_userptr);
        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_drv.c 
b/drivers/gpu/drm/virtio/virtgpu_drv.c
index ffca6e2e1c9a..d79558139084 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
@@ -151,6 +151,7 @@ static unsigned int features[] = {
        VIRTIO_GPU_F_RESOURCE_UUID,
        VIRTIO_GPU_F_RESOURCE_BLOB,
        VIRTIO_GPU_F_CONTEXT_INIT,
+       VIRTIO_GPU_F_RESOURCE_USERPTR,
 };
 static struct virtio_driver virtio_gpu_driver = {
        .feature_table = features,
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h 
b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 64c236169db8..7bdcbaa20ef1 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -249,6 +249,7 @@ struct virtio_gpu_device {
        bool has_resource_blob;
        bool has_host_visible;
        bool has_context_init;
+       bool has_resource_userptr;
        struct virtio_shm_region host_visible_region;
        struct drm_mm host_visible_mm;
 
diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c 
b/drivers/gpu/drm/virtio/virtgpu_kms.c
index 7dfb2006c561..3d5158caef46 100644
--- a/drivers/gpu/drm/virtio/virtgpu_kms.c
+++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
@@ -174,6 +174,9 @@ int virtio_gpu_init(struct virtio_device *vdev, struct 
drm_device *dev)
        if (virtio_has_feature(vgdev->vdev, VIRTIO_GPU_F_RESOURCE_BLOB)) {
                vgdev->has_resource_blob = true;
        }
+       if (virtio_has_feature(vgdev->vdev, VIRTIO_GPU_F_RESOURCE_USERPTR)) {
+               vgdev->has_resource_userptr = true;
+       }
        if (virtio_get_shm_region(vgdev->vdev, &vgdev->host_visible_region,
                                  VIRTIO_GPU_SHM_ID_HOST_VISIBLE)) {
                if (!devm_request_mem_region(&vgdev->vdev->dev,
@@ -197,11 +200,12 @@ int virtio_gpu_init(struct virtio_device *vdev, struct 
drm_device *dev)
                vgdev->has_context_init = true;
        }
 
-       DRM_INFO("features: %cvirgl %cedid %cresource_blob %chost_visible",
+       DRM_INFO("features: %cvirgl %cedid %cresource_blob %chost_visible 
%cresource_userptr",
                 vgdev->has_virgl_3d    ? '+' : '-',
                 vgdev->has_edid        ? '+' : '-',
                 vgdev->has_resource_blob ? '+' : '-',
-                vgdev->has_host_visible ? '+' : '-');
+                vgdev->has_host_visible ? '+' : '-',
+                vgdev->has_resource_userptr ? '+' : '-');
 
        DRM_INFO("features: %ccontext_init\n",
                 vgdev->has_context_init ? '+' : '-');
-- 
2.34.1