drm/qxl: drop set_prod_notify parameter from qxl_ring_create

Since qxl_io_reset(qdev) will be called immediately
after qxl_ring_create() been called,
and parameter like notify_on_prod will be set to default value.
So the call to qxl_ring_init_hdr() before becomes meaningless.

Signed-off-by: Zongmin Zhou<zhouzongmin@kylinos.cn>
Suggested-by: Ming Xie<xieming@kylinos.cn>
Link: http://patchwork.freedesktop.org/patch/msgid/20220920065023.1633303-1-zhouzongmin@kylinos.cn
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
index 7b00c95..63aa96a 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_cmd.c
+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
@@ -53,17 +53,11 @@ void qxl_ring_free(struct qxl_ring *ring)
        kfree(ring);
 }
 
-void qxl_ring_init_hdr(struct qxl_ring *ring)
-{
-       ring->ring->header.notify_on_prod = ring->n_elements;
-}
-
 struct qxl_ring *
 qxl_ring_create(struct qxl_ring_header *header,
                int element_size,
                int n_elements,
                int prod_notify,
-               bool set_prod_notify,
                wait_queue_head_t *push_event)
 {
        struct qxl_ring *ring;
@@ -77,8 +71,6 @@ qxl_ring_create(struct qxl_ring_header *header,
        ring->n_elements = n_elements;
        ring->prod_notify = prod_notify;
        ring->push_event = push_event;
-       if (set_prod_notify)
-               qxl_ring_init_hdr(ring);
        spin_lock_init(&ring->lock);
        return ring;
 }

diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index 47c1696..432758a 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -277,10 +277,8 @@ struct qxl_ring *qxl_ring_create(struct qxl_ring_header *header,
                                 int element_size,
                                 int n_elements,
                                 int prod_notify,
-                                bool set_prod_notify,
                                 wait_queue_head_t *push_event);
 void qxl_ring_free(struct qxl_ring *ring);
-void qxl_ring_init_hdr(struct qxl_ring *ring);
 int qxl_check_idle(struct qxl_ring *ring);
 
 static inline uint64_t

diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c
index 9bf6d4c..dc3828d 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_kms.c
+++ b/drivers/gpu/drm/qxl/qxl_kms.c
@@ -194,7 +194,6 @@ int qxl_device_init(struct qxl_device *qdev,
                                             sizeof(struct qxl_command),
                                             QXL_COMMAND_RING_SIZE,
                                             qdev->io_base + QXL_IO_NOTIFY_CMD,
-                                            false,
                                             &qdev->display_event);
        if (!qdev->command_ring) {
                DRM_ERROR("Unable to create command ring\n");
@@ -207,7 +206,6 @@ int qxl_device_init(struct qxl_device *qdev,
                                sizeof(struct qxl_command),
                                QXL_CURSOR_RING_SIZE,
                                qdev->io_base + QXL_IO_NOTIFY_CURSOR,
-                               false,
                                &qdev->cursor_event);
 
        if (!qdev->cursor_ring) {
@@ -219,7 +217,7 @@ int qxl_device_init(struct qxl_device *qdev,
        qdev->release_ring = qxl_ring_create(
                                &(qdev->ram_header->release_ring_hdr),
                                sizeof(uint64_t),
-                               QXL_RELEASE_RING_SIZE, 0, true,
+                               QXL_RELEASE_RING_SIZE, 0,
                                NULL);
 
        if (!qdev->release_ring) {