All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	Christian Koenig <christian.koenig@amd.com>,
	Huang Rui <ray.huang@amd.com>, David Airlie <airlied@linux.ie>,
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v4 17/17] drm/ttm: drop ttm_buffer_object->resv
Date: Fri,  2 Aug 2019 07:22:47 +0200	[thread overview]
Message-ID: <20190802052247.18427-18-kraxel@redhat.com> (raw)
In-Reply-To: <20190802052247.18427-1-kraxel@redhat.com>

All users moved to ttm_buffer_object->base.resv

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
---
 include/drm/ttm/ttm_bo_api.h | 1 -
 drivers/gpu/drm/ttm/ttm_bo.c | 2 --
 2 files changed, 3 deletions(-)

diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index 7ffc50a3303d..65ef5376de59 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -230,7 +230,6 @@ struct ttm_buffer_object {
 
 	struct sg_table *sg;
 
-	struct reservation_object *resv;
 	struct mutex wu_mutex;
 };
 
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 4d43a241e7eb..6eeb0759c449 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1330,11 +1330,9 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,
 	bo->acc_size = acc_size;
 	bo->sg = sg;
 	if (resv) {
-		bo->resv = resv;
 		bo->base.resv = resv;
 		reservation_object_assert_held(bo->base.resv);
 	} else {
-		bo->resv = &bo->base._resv;
 		bo->base.resv = &bo->base._resv;
 	}
 	if (!ttm_bo_uses_embedded_gem_object(bo)) {
-- 
2.18.1


WARNING: multiple messages have this Message-ID (diff)
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>,
	Christian Koenig <christian.koenig@amd.com>,
	Huang Rui <ray.huang@amd.com>, David Airlie <airlied@linux.ie>,
	open list <linux-kernel@vger.kernel.org>
Subject: [PATCH v4 17/17] drm/ttm: drop ttm_buffer_object->resv
Date: Fri,  2 Aug 2019 07:22:47 +0200	[thread overview]
Message-ID: <20190802052247.18427-18-kraxel@redhat.com> (raw)
In-Reply-To: <20190802052247.18427-1-kraxel@redhat.com>

All users moved to ttm_buffer_object->base.resv

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
---
 include/drm/ttm/ttm_bo_api.h | 1 -
 drivers/gpu/drm/ttm/ttm_bo.c | 2 --
 2 files changed, 3 deletions(-)

diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index 7ffc50a3303d..65ef5376de59 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -230,7 +230,6 @@ struct ttm_buffer_object {
 
 	struct sg_table *sg;
 
-	struct reservation_object *resv;
 	struct mutex wu_mutex;
 };
 
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 4d43a241e7eb..6eeb0759c449 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1330,11 +1330,9 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,
 	bo->acc_size = acc_size;
 	bo->sg = sg;
 	if (resv) {
-		bo->resv = resv;
 		bo->base.resv = resv;
 		reservation_object_assert_held(bo->base.resv);
 	} else {
-		bo->resv = &bo->base._resv;
 		bo->base.resv = &bo->base._resv;
 	}
 	if (!ttm_bo_uses_embedded_gem_object(bo)) {
-- 
2.18.1

  parent reply	other threads:[~2019-08-02  5:23 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-02  5:22 [PATCH v4 00/17] drm/ttm: make ttm bo a gem bo subclass Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 01/17] drm/ttm: add gem base object Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 02/17] drm/vram: use embedded gem object Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 03/17] drm/qxl: " Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 04/17] drm/radeon: " Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 05/17] drm/amdgpu: " Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 06/17] drm/nouveau: " Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 07/17] drm/ttm: use gem reservation object Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 08/17] drm/ttm: use gem vma_node Gerd Hoffmann
2019-08-02  5:22 ` Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 09/17] drm/ttm: set both resv and base.resv pointers Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 10/17] drm/ttm: switch ttm core from bo->resv to bo->base.resv Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 11/17] drm/radeon: switch driver " Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 12/17] drm/vmwgfx: " Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-03 19:10   ` Thomas Hellstrom
2019-08-03 19:10     ` Thomas Hellstrom
2019-08-02  5:22 ` [PATCH v4 13/17] drm/amdgpu: " Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 14/17] drm/nouveau: " Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 15/17] drm/qxl: " Gerd Hoffmann
2019-08-02  5:22 ` Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` [PATCH v4 16/17] drm/virtio: " Gerd Hoffmann
2019-08-02  5:22   ` Gerd Hoffmann
2019-08-02  5:22 ` Gerd Hoffmann [this message]
2019-08-02  5:22   ` [PATCH v4 17/17] drm/ttm: drop ttm_buffer_object->resv Gerd Hoffmann
2019-08-05  9:39 ` [PATCH v4 00/17] drm/ttm: make ttm bo a gem bo subclass Christian König

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=20190802052247.18427-18-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=airlied@linux.ie \
    --cc=bskeggs@redhat.com \
    --cc=christian.koenig@amd.com \
    --cc=ckoenig.leichtzumerken@gmail.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ray.huang@amd.com \
    --cc=thomas@shipmail.org \
    --cc=tzimmermann@suse.de \
    /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: link
Be 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.