From: "Adrián Larumbe" <adrian.larumbe@collabora.com>
To: Qiang Yu <yuq825@gmail.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Boris Brezillon <boris.brezillon@collabora.com>,
Rob Herring <robh@kernel.org>,
Steven Price <steven.price@arm.com>,
Sumit Semwal <sumit.semwal@linaro.org>,
Christian Koenig= <christian.koenig@amd.com>,
Dmitry Osipenko <dmitry.osipenko@collabora.com>,
Zack Rusin <zack.rusin@broadcom.com>
Cc: kernel@collabora.com,
Adrian Larumbe <adrian.larumbe@collabora.com>,
dri-devel@lists.freedesktop.org, lima@lists.freedesktop.org,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linaro-mm-sig@lists.linaro.org
Subject: [PATCH v3 2/2] drm/gem-shmem: Add import attachment warning to locked pin function
Date: Wed, 1 May 2024 07:56:00 +0100 [thread overview]
Message-ID: <20240501065650.2809530-3-adrian.larumbe@collabora.com> (raw)
In-Reply-To: <20240501065650.2809530-1-adrian.larumbe@collabora.com>
Commit ec144244a43f ("drm/gem-shmem: Acquire reservation lock in GEM
pin/unpin callbacks") moved locking DRM object's dma reservation to
drm_gem_shmem_object_pin, and made drm_gem_shmem_pin_locked public, so we
need to make sure the non-NULL check warning is also added to the latter.
Signed-off-by: Adrián Larumbe <adrian.larumbe@collabora.com>
---
drivers/gpu/drm/drm_gem_shmem_helper.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 177773bcdbfd..ad5d9f704e15 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -233,6 +233,8 @@ int drm_gem_shmem_pin_locked(struct drm_gem_shmem_object *shmem)
dma_resv_assert_held(shmem->base.resv);
+ drm_WARN_ON(shmem->base.dev, shmem->base.import_attach);
+
ret = drm_gem_shmem_get_pages(shmem);
return ret;
--
2.44.0
next prev parent reply other threads:[~2024-05-01 6:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-01 6:55 [PATCH v3 0/2] drm: Fix dma_resv deadlock at drm object pin time Adrián Larumbe
2024-05-01 6:55 ` [PATCH v3 1/2] drm/panfrost: " Adrián Larumbe
2024-05-02 7:09 ` Boris Brezillon
2024-05-02 11:14 ` Thomas Zimmermann
2024-05-01 6:56 ` Adrián Larumbe [this message]
2024-05-02 7:01 ` [PATCH v3 2/2] drm/gem-shmem: Add import attachment warning to locked pin function Boris Brezillon
2024-05-02 11:51 ` [PATCH v3 0/2] drm: Fix dma_resv deadlock at drm object pin time Thomas Zimmermann
2024-05-02 11:59 ` Boris Brezillon
2024-05-02 12:00 ` Boris Brezillon
2024-05-02 12:18 ` Thomas Zimmermann
2024-05-17 18:16 ` Adrián Larumbe
2024-05-21 16:18 ` Boris Brezillon
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=20240501065650.2809530-3-adrian.larumbe@collabora.com \
--to=adrian.larumbe@collabora.com \
--cc=airlied@gmail.com \
--cc=boris.brezillon@collabora.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dmitry.osipenko@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel@collabora.com \
--cc=lima@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=robh@kernel.org \
--cc=steven.price@arm.com \
--cc=sumit.semwal@linaro.org \
--cc=tzimmermann@suse.de \
--cc=yuq825@gmail.com \
--cc=zack.rusin@broadcom.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).