Commit 461a4df2 authored by Zongmin Zhou's avatar Zongmin Zhou Committed by Gerd Hoffmann
Browse files

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: default avatarZongmin <Zhou&lt;zhouzongmin@kylinos.cn>
Suggested-by: default avatarMing <Xie&lt;xieming@kylinos.cn>
Link: http://patchwork.freedesktop.org/patch/msgid/20220920065023.1633303-1-zhouzongmin@kylinos.cn


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 09847723

drivers/gpu/drm/qxl/qxl_cmd.c

+0 −8
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/qxl/qxl_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/qxl/qxl_kms.c

+1 −3
Original line number Diff line number Diff line
@@ -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) {