Commit 3ebe3ddf authored by Gerd Hoffmann's avatar Gerd Hoffmann

drm/qxl: drop unused fields from struct qxl_device

slot_id_bits and slot_gen_bits can be read directly from qxlrom instead.
va_slot_mask is never used anywhere.
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190118122020.27596-6-kraxel@redhat.com
parent a8dc4214
...@@ -232,9 +232,6 @@ struct qxl_device { ...@@ -232,9 +232,6 @@ struct qxl_device {
struct qxl_memslot main_slot; struct qxl_memslot main_slot;
struct qxl_memslot surfaces_slot; struct qxl_memslot surfaces_slot;
uint8_t slot_id_bits;
uint8_t slot_gen_bits;
uint64_t va_slot_mask;
spinlock_t release_lock; spinlock_t release_lock;
struct idr release_idr; struct idr release_idr;
......
...@@ -78,9 +78,9 @@ static void setup_slot(struct qxl_device *qdev, ...@@ -78,9 +78,9 @@ static void setup_slot(struct qxl_device *qdev,
slot->generation = qdev->rom->slot_generation; slot->generation = qdev->rom->slot_generation;
high_bits = (qdev->rom->slots_start + slot->index) high_bits = (qdev->rom->slots_start + slot->index)
<< qdev->slot_gen_bits; << qdev->rom->slot_gen_bits;
high_bits |= slot->generation; high_bits |= slot->generation;
high_bits <<= (64 - (qdev->slot_gen_bits + qdev->slot_id_bits)); high_bits <<= (64 - (qdev->rom->slot_gen_bits + qdev->rom->slot_id_bits));
slot->high_bits = high_bits; slot->high_bits = high_bits;
DRM_INFO("slot %d (%s): base 0x%08lx, size 0x%08lx\n", DRM_INFO("slot %d (%s): base 0x%08lx, size 0x%08lx\n",
...@@ -235,12 +235,6 @@ int qxl_device_init(struct qxl_device *qdev, ...@@ -235,12 +235,6 @@ int qxl_device_init(struct qxl_device *qdev,
r = -ENOMEM; r = -ENOMEM;
goto cursor_ring_free; goto cursor_ring_free;
} }
/* TODO - slot initialization should happen on reset. where is our
* reset handler? */
qdev->slot_gen_bits = qdev->rom->slot_gen_bits;
qdev->slot_id_bits = qdev->rom->slot_id_bits;
qdev->va_slot_mask =
(~(uint64_t)0) >> (qdev->slot_id_bits + qdev->slot_gen_bits);
idr_init(&qdev->release_idr); idr_init(&qdev->release_idr);
spin_lock_init(&qdev->release_idr_lock); spin_lock_init(&qdev->release_idr_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment