]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/shmem-helper: Remove obsoleted is_iomem test
authorDmitry Osipenko <dmitry.osipenko@collabora.com>
Sat, 22 Mar 2025 21:26:04 +0000 (00:26 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Aug 2025 08:51:28 +0000 (09:51 +0100)
commit eab10538073c3ff9e21c857bd462f79f2f6f7e00 upstream.

Everything that uses the mapped buffer should be agnostic to is_iomem.
The only reason for the is_iomem test is that we're setting shmem->vaddr
to the returned map->vaddr. Now that the shmem->vaddr code is gone, remove
the obsoleted is_iomem test to clean up the code.

Acked-by: Maxime Ripard <mripard@kernel.org>
Suggested-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.d>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250322212608.40511-7-dmitry.osipenko@collabora.com
Stable-dep-of: 6d496e956998 ("Revert "drm/gem-shmem: Use dma_buf from GEM object instance"")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/drm_gem_shmem_helper.c

index d99dee67353a1fcbfcdb3b09eec3c710973d8f3a..de197a9328521678cc0356c51abe04af69289744 100644 (file)
@@ -340,12 +340,6 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem,
 
        if (drm_gem_is_imported(obj)) {
                ret = dma_buf_vmap(obj->dma_buf, map);
-               if (!ret) {
-                       if (drm_WARN_ON(obj->dev, map->is_iomem)) {
-                               dma_buf_vunmap(obj->dma_buf, map);
-                               return -EIO;
-                       }
-               }
        } else {
                pgprot_t prot = PAGE_KERNEL;