On Thu, 23 May 2024 12:32:19 +0100 Adrián Larumbe <adrian.laru...@collabora.com> wrote:
> 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. > > Cc: Thomas Zimmermann <tzimmerm...@suse.de> > Cc: Dmitry Osipenko <dmitry.osipe...@collabora.com> > Cc: Boris Brezillon <boris.brezil...@collabora.com> > Fixes: a78027847226 ("drm/gem: Acquire reservation lock in > drm_gem_{pin/unpin}()") > Signed-off-by: Adrián Larumbe <adrian.laru...@collabora.com> Reviewed-by: Boris Brezillon <boris.brezil...@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;