From: Nathan Chancellor <natechancellor@gmail.com>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
Dave Airlie <airlied@gmail.com>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH] drm/legacy: Fix type for drm_local_map.offset
Date: Thu, 2 Apr 2020 18:34:20 -0700 [thread overview]
Message-ID: <20200403013420.GA11516@ubuntu-m2-xlarge-x86> (raw)
In-Reply-To: <20200402215926.30714-1-chris@chris-wilson.co.uk>
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 <natechancellor@gmail.com>
> Fixes: 8e4ff9b56957 ("drm: Remove the dma_alloc_coherent wrapper for internal usage")
> 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>
> ---
> 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 <natechancellor@gmail.com> # build
next prev parent reply other threads:[~2020-04-03 1:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-01 5:50 [git pull] drm for 5.7-rc1 Dave Airlie
2020-04-01 9:22 ` Jani Nikula
2020-04-01 22:35 ` pr-tracker-bot
2020-04-02 20:33 ` Nathan Chancellor
2020-04-02 20:43 ` Linus Torvalds
2020-04-03 8:12 ` Daniel Vetter
2020-04-02 21:59 ` [PATCH] drm/legacy: Fix type for drm_local_map.offset Chris Wilson
2020-04-03 1:34 ` Nathan Chancellor [this message]
2020-04-03 8:28 ` Daniel Vetter
2020-04-03 17:14 ` Linus Torvalds
2020-04-03 17:16 ` Daniel Vetter
2020-04-09 7:07 ` Daniel Vetter
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=20200403013420.GA11516@ubuntu-m2-xlarge-x86 \
--to=natechancellor@gmail.com \
--cc=airlied@gmail.com \
--cc=chris@chris-wilson.co.uk \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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 NNTP newsgroup(s).