]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/legacy: Fix type for drm_local_map.offset
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 2 Apr 2020 21:59:26 +0000 (22:59 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 9 Apr 2020 07:06:45 +0000 (09:06 +0200)
drm_local_map.offset is not only used for resource_size_t but also
dma_addr_t which may be of different sizes.

Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Fixes: ef1d514da8b8 ("drm: Remove the dma_alloc_coherent wrapper for internal usage")
Tested-by: Nathan Chancellor <natechancellor@gmail.com> # build
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Nathan Chancellor <natechancellor@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200402215926.30714-1-chris@chris-wilson.co.uk
include/drm/drm_legacy.h

index dcef3598f49e0e9a6cd621de2fe900b9f2d100fa..aed382c17b2695a7d617d87fcbbe89351130bab2 100644 (file)
@@ -136,7 +136,7 @@ struct drm_sg_mem {
  * Kernel side of a mapping
  */
 struct drm_local_map {
-       resource_size_t offset;  /**< Requested physical address (0 for SAREA)*/
+       dma_addr_t offset;       /**< Requested physical address (0 for SAREA)*/
        unsigned long size;      /**< Requested physical size (bytes) */
        enum drm_map_type type;  /**< Type of memory to map */
        enum drm_map_flags flags;        /**< Flags */