On Thu, Apr 02, 2020 at 10:59:26PM +0100, Chris Wilson wrote:
> 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 <natechancel...@gmail.com>
> Fixes: 8e4ff9b56957 ("drm: Remove the dma_alloc_coherent wrapper for internal
> usage")
> Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
> Cc: Dave Airlie <airl...@gmail.com>
> Cc: Nathan Chancellor <natechancel...@gmail.com>
> Cc: Linus Torvalds <torva...@linux-foundation.org>
> ---
> include/drm/drm_legacy.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h
> index dcef3598f49e..aed382c17b26 100644
> --- a/include/drm/drm_legacy.h
> +++ b/include/drm/drm_legacy.h
> @@ -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 */
> --
> 2.20.1
>
Thanks for the quick fix!
I ran it through my set of build tests and nothing else seems to have
broken (at least not any more than it already is...).
Tested-by: Nathan Chancellor <natechancel...@gmail.com> # build
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
