From: Gerd Hoffmann <kraxel@redhat.com> To: dri-devel@lists.freedesktop.org Cc: ckoenig.leichtzumerken@gmail.com, thomas@shipmail.org, tzimmermann@suse.de, daniel@ffwll.ch, bskeggs@redhat.com, Gerd Hoffmann <kraxel@redhat.com>, Dave Airlie <airlied@redhat.com>, David Airlie <airlied@linux.ie>, virtualization@lists.linux-foundation.org (open list:DRM DRIVER FOR QXL VIRTUAL GPU), spice-devel@lists.freedesktop.org (open list:DRM DRIVER FOR QXL VIRTUAL GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 16/18] drm/qxl: switch driver from bo->resv to bo->base.resv Date: Fri, 28 Jun 2019 11:03:01 +0200 [thread overview] Message-ID: <20190628090303.29467-17-kraxel@redhat.com> (raw) In-Reply-To: <20190628090303.29467-1-kraxel@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Acked-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/qxl/qxl_debugfs.c | 2 +- drivers/gpu/drm/qxl/qxl_release.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c index 013b938986c7..f30460782f05 100644 --- a/drivers/gpu/drm/qxl/qxl_debugfs.c +++ b/drivers/gpu/drm/qxl/qxl_debugfs.c @@ -61,7 +61,7 @@ qxl_debugfs_buffers_info(struct seq_file *m, void *data) int rel; rcu_read_lock(); - fobj = rcu_dereference(bo->tbo.resv->fence); + fobj = rcu_dereference(bo->tbo.base.resv->fence); rel = fobj ? fobj->shared_count : 0; rcu_read_unlock(); diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c index 32126e8836b3..1b7be82c8e68 100644 --- a/drivers/gpu/drm/qxl/qxl_release.c +++ b/drivers/gpu/drm/qxl/qxl_release.c @@ -234,7 +234,7 @@ static int qxl_release_validate_bo(struct qxl_bo *bo) return ret; } - ret = reservation_object_reserve_shared(bo->tbo.resv, 1); + ret = reservation_object_reserve_shared(bo->tbo.base.resv, 1); if (ret) return ret; @@ -454,9 +454,9 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release) list_for_each_entry(entry, &release->bos, head) { bo = entry->bo; - reservation_object_add_shared_fence(bo->resv, &release->base); + reservation_object_add_shared_fence(bo->base.resv, &release->base); ttm_bo_add_to_lru(bo); - reservation_object_unlock(bo->resv); + reservation_object_unlock(bo->base.resv); } spin_unlock(&glob->lru_lock); ww_acquire_fini(&release->ticket); -- 2.18.1
WARNING: multiple messages have this Message-ID (diff)
From: Gerd Hoffmann <kraxel@redhat.com> To: dri-devel@lists.freedesktop.org Cc: thomas@shipmail.org, tzimmermann@suse.de, David Airlie <airlied@linux.ie>, ckoenig.leichtzumerken@gmail.com, open list <linux-kernel@vger.kernel.org>, "open list:DRM DRIVER FOR QXL VIRTUAL GPU" <virtualization@lists.linux-foundation.org>, daniel@ffwll.ch, "open list:DRM DRIVER FOR QXL VIRTUAL GPU" <spice-devel@lists.freedesktop.org>, Dave Airlie <airlied@redhat.com>, bskeggs@redhat.com Subject: [PATCH v3 16/18] drm/qxl: switch driver from bo->resv to bo->base.resv Date: Fri, 28 Jun 2019 11:03:01 +0200 [thread overview] Message-ID: <20190628090303.29467-17-kraxel@redhat.com> (raw) In-Reply-To: <20190628090303.29467-1-kraxel@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Acked-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/qxl/qxl_debugfs.c | 2 +- drivers/gpu/drm/qxl/qxl_release.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c index 013b938986c7..f30460782f05 100644 --- a/drivers/gpu/drm/qxl/qxl_debugfs.c +++ b/drivers/gpu/drm/qxl/qxl_debugfs.c @@ -61,7 +61,7 @@ qxl_debugfs_buffers_info(struct seq_file *m, void *data) int rel; rcu_read_lock(); - fobj = rcu_dereference(bo->tbo.resv->fence); + fobj = rcu_dereference(bo->tbo.base.resv->fence); rel = fobj ? fobj->shared_count : 0; rcu_read_unlock(); diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c index 32126e8836b3..1b7be82c8e68 100644 --- a/drivers/gpu/drm/qxl/qxl_release.c +++ b/drivers/gpu/drm/qxl/qxl_release.c @@ -234,7 +234,7 @@ static int qxl_release_validate_bo(struct qxl_bo *bo) return ret; } - ret = reservation_object_reserve_shared(bo->tbo.resv, 1); + ret = reservation_object_reserve_shared(bo->tbo.base.resv, 1); if (ret) return ret; @@ -454,9 +454,9 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release) list_for_each_entry(entry, &release->bos, head) { bo = entry->bo; - reservation_object_add_shared_fence(bo->resv, &release->base); + reservation_object_add_shared_fence(bo->base.resv, &release->base); ttm_bo_add_to_lru(bo); - reservation_object_unlock(bo->resv); + reservation_object_unlock(bo->base.resv); } spin_unlock(&glob->lru_lock); ww_acquire_fini(&release->ticket); -- 2.18.1 _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2019-06-28 9:04 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-28 9:02 [PATCH v3 00/18] drm/ttm: make ttm bo a gem bo subclass Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 01/18] drm/ttm: add gem base object Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 02/18] drm/vram: use embedded gem object Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 03/18] drm/qxl: " Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 04/18] drm/radeon: " Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 05/18] drm/amdgpu: " Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 06/18] drm/nouveau: " Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 07/18] drm/ttm: use gem reservation object Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 08/18] drm/ttm: use gem vma_node Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 09/18] drm/vram: drop drm_gem_vram_driver_gem_prime_mmap Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 10/18] drm/ttm: set both resv and base.resv pointers Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 11/18] drm/ttm: switch ttm core from bo->resv to bo->base.resv Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 12/18] drm/radeon: switch driver " Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 13/18] drm/vmwgfx: " Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:02 ` [PATCH v3 14/18] drm/amdgpu: " Gerd Hoffmann 2019-06-28 9:02 ` Gerd Hoffmann 2019-06-28 9:03 ` [PATCH v3 15/18] drm/nouveau: " Gerd Hoffmann 2019-06-28 9:03 ` Gerd Hoffmann 2019-06-28 9:03 ` Gerd Hoffmann [this message] 2019-06-28 9:03 ` [PATCH v3 16/18] drm/qxl: " Gerd Hoffmann 2019-06-28 9:03 ` [PATCH v3 17/18] drm/virtio: " Gerd Hoffmann 2019-06-28 9:03 ` Gerd Hoffmann 2019-06-28 9:03 ` [PATCH v3 18/18] drm/ttm: drop ttm_buffer_object->resv Gerd Hoffmann 2019-06-28 9:03 ` Gerd Hoffmann 2019-06-28 16:49 ` [PATCH v3 00/18] drm/ttm: make ttm bo a gem bo subclass Daniel Vetter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190628090303.29467-17-kraxel@redhat.com \ --to=kraxel@redhat.com \ --cc=airlied@linux.ie \ --cc=airlied@redhat.com \ --cc=bskeggs@redhat.com \ --cc=ckoenig.leichtzumerken@gmail.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=spice-devel@lists.freedesktop.org \ --cc=thomas@shipmail.org \ --cc=tzimmermann@suse.de \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.