From: Neil Armstrong <narmstrong@baylibre.com>
To: Arnd Bergmann <arnd@arndb.de>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
Kevin Hilman <khilman@baylibre.com>
Cc: Julien Masson <jmasson@baylibre.com>,
Maxime Jourdan <mjourdan@baylibre.com>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-amlogic@lists.infradead.org,
Sam Ravnborg <sam@ravnborg.org>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] drm: meson: fix address type confusion
Date: Wed, 8 Jan 2020 09:32:25 +0100 [thread overview]
Message-ID: <c7f128c3-36a3-7763-7d22-af8a1b533975@baylibre.com> (raw)
In-Reply-To: <20200107214653.1173199-1-arnd@arndb.de>
On 07/01/2020 22:46, Arnd Bergmann wrote:
> Casting a pointer to dma_addr_t produces a warning:
>
> drivers/gpu/drm/meson/meson_rdma.c: In function 'meson_rdma_free':
> drivers/gpu/drm/meson/meson_rdma.c:59:25: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
> priv->rdma.addr_phys = (dma_addr_t)NULL;
>
> In this case, it's worse because the variable name has the suffix
> '_phys', which often indicates a phys_addr_t rather than dma_addr_t,
> i.e. yet another incompatible type.
>
> Change it to use consistent naming and avoid NULL.
>
> Fixes: 63fba242c464 ("drm/meson: add RDMA module driver")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/gpu/drm/meson/meson_drv.h | 2 +-
> drivers/gpu/drm/meson/meson_rdma.c | 12 ++++++------
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h
> index f9a0c8e9d4d0..04fdf3826643 100644
> --- a/drivers/gpu/drm/meson/meson_drv.h
> +++ b/drivers/gpu/drm/meson/meson_drv.h
> @@ -135,7 +135,7 @@ struct meson_drm {
> } venc;
>
> struct {
> - dma_addr_t addr_phys;
> + dma_addr_t addr_dma;
> uint32_t *addr;
> unsigned int offset;
> } rdma;
> diff --git a/drivers/gpu/drm/meson/meson_rdma.c b/drivers/gpu/drm/meson/meson_rdma.c
> index 25b34b1e72a7..130382178c63 100644
> --- a/drivers/gpu/drm/meson/meson_rdma.c
> +++ b/drivers/gpu/drm/meson/meson_rdma.c
> @@ -27,7 +27,7 @@ int meson_rdma_init(struct meson_drm *priv)
> /* Allocate a PAGE buffer */
> priv->rdma.addr =
> dma_alloc_coherent(priv->dev, SZ_4K,
> - &priv->rdma.addr_phys,
> + &priv->rdma.addr_dma,
> GFP_KERNEL);
> if (!priv->rdma.addr)
> return -ENOMEM;
> @@ -47,16 +47,16 @@ int meson_rdma_init(struct meson_drm *priv)
>
> void meson_rdma_free(struct meson_drm *priv)
> {
> - if (!priv->rdma.addr && !priv->rdma.addr_phys)
> + if (!priv->rdma.addr && !priv->rdma.addr_dma)
> return;
>
> meson_rdma_stop(priv);
>
> dma_free_coherent(priv->dev, SZ_4K,
> - priv->rdma.addr, priv->rdma.addr_phys);
> + priv->rdma.addr, priv->rdma.addr_dma);
>
> priv->rdma.addr = NULL;
> - priv->rdma.addr_phys = (dma_addr_t)NULL;
> + priv->rdma.addr_dma = (dma_addr_t)0;
> }
>
> void meson_rdma_setup(struct meson_drm *priv)
> @@ -118,11 +118,11 @@ void meson_rdma_flush(struct meson_drm *priv)
> meson_rdma_stop(priv);
>
> /* Start of Channel 1 register writes buffer */
> - writel(priv->rdma.addr_phys,
> + writel(priv->rdma.addr_dma,
> priv->io_base + _REG(RDMA_AHB_START_ADDR_1));
>
> /* Last byte on Channel 1 register writes buffer */
> - writel(priv->rdma.addr_phys + (priv->rdma.offset * RDMA_DESC_SIZE) - 1,
> + writel(priv->rdma.addr_dma + (priv->rdma.offset * RDMA_DESC_SIZE) - 1,
> priv->io_base + _REG(RDMA_AHB_END_ADDR_1));
>
> /* Trigger Channel 1 on VSYNC event */
>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Applying to drm-misc-fixes
Thanks,
Neil
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
prev parent reply other threads:[~2020-01-08 8:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 21:46 [PATCH] drm: meson: fix address type confusion Arnd Bergmann
2020-01-08 8:32 ` Neil Armstrong [this message]
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=c7f128c3-36a3-7763-7d22-af8a1b533975@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=airlied@linux.ie \
--cc=arnd@arndb.de \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=jmasson@baylibre.com \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mjourdan@baylibre.com \
--cc=sam@ravnborg.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).