From: "Noralf Trønnes" <noralf@tronnes.org>
To: tzimmermann@suse.de
Cc: airlied@linux.ie, daniel.vetter@ffwll.ch, daniel@ffwll.ch,
dri-devel@lists.freedesktop.org,
linux-amlogic@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-aspeed@lists.ozlabs.org, linux-mips@vger.kernel.org,
linux-renesas-soc@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-sunxi@lists.linux.dev, maarten.lankhorst@linux.intel.com,
marcel@ziswiler.com, mripard@kernel.org,
naresh.kamboju@linaro.org, noralf@tronnes.org
Subject: Re: [PATCH v2 1/2] drm/mipi-dbi: Remove dependency on GEM CMA helper library
Date: Tue, 11 Jan 2022 13:02:50 +0100 [thread overview]
Message-ID: <a9e2d66e-1a85-b61f-ee3b-ca7032e0516f@tronnes.org> (raw)
In-Reply-To: <20211106193509.17472-2-tzimmermann@suse.de>
> The MIPI DBI helpers access struct drm_gem_cma_object.vaddr in a
> few places. Replace all instances with the correct generic GEM
> functions. Use drm_gem_fb_vmap() for mapping a framebuffer's GEM
> objects and drm_gem_fb_vunmap() for unmapping them. This removes
> the dependency on CMA helpers within MIPI DBI.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/drm_mipi_dbi.c | 34 +++++++++++++++++++++++++---------
> 1 file changed, 25 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_mipi_dbi.c
b/drivers/gpu/drm/drm_mipi_dbi.c
> index 71b646c4131f..f80fd6c0ccf8 100644
> --- a/drivers/gpu/drm/drm_mipi_dbi.c
> +++ b/drivers/gpu/drm/drm_mipi_dbi.c
> @@ -15,9 +15,10 @@
> #include <drm/drm_connector.h>
> #include <drm/drm_damage_helper.h>
> #include <drm/drm_drv.h>
> -#include <drm/drm_gem_cma_helper.h>
> +#include <drm/drm_file.h>
> #include <drm/drm_format_helper.h>
> #include <drm/drm_fourcc.h>
> +#include <drm/drm_gem.h>
> #include <drm/drm_gem_framebuffer_helper.h>
> #include <drm/drm_mipi_dbi.h>
> #include <drm/drm_modes.h>
> @@ -200,13 +201,19 @@ int mipi_dbi_buf_copy(void *dst, struct
drm_framebuffer *fb,
> struct drm_rect *clip, bool swap)
> {
> struct drm_gem_object *gem = drm_gem_fb_get_obj(fb, 0);
> - struct drm_gem_cma_object *cma_obj = to_drm_gem_cma_obj(gem);
> - void *src = cma_obj->vaddr;
> + struct dma_buf_map map[DRM_FORMAT_MAX_PLANES];
> + struct dma_buf_map data[DRM_FORMAT_MAX_PLANES];
> + void *src;
> int ret;
>
> ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE);
> if (ret)
> return ret;
> + src = data[0].vaddr; /* TODO: Use mapping abstraction properly */
This assignment should be after the _vmap() call. The MIPI DBI drivers
are currently broken because of this.
Noralf.
> +
> + ret = drm_gem_fb_vmap(fb, map, data);
> + if (ret)
> + goto out_drm_gem_fb_end_cpu_access;
>
> switch (fb->format->format) {
> case DRM_FORMAT_RGB565:
> @@ -221,9 +228,11 @@ int mipi_dbi_buf_copy(void *dst, struct
drm_framebuffer *fb,
> default:
> drm_err_once(fb->dev, "Format is not supported: %p4cc\n",
> &fb->format->format);
> - return -EINVAL;
> + ret = -EINVAL;
> }
>
> + drm_gem_fb_vunmap(fb, map);
> +out_drm_gem_fb_end_cpu_access:
> drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE);
>
> return ret;
>
next prev parent reply other threads:[~2022-01-11 12:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-06 19:35 [RESEND PATCH v2 0/2] drm: Small CMA cleanups Thomas Zimmermann
2021-11-06 19:35 ` [PATCH v2 1/2] drm/mipi-dbi: Remove dependency on GEM CMA helper library Thomas Zimmermann
2022-01-11 12:02 ` Noralf Trønnes [this message]
2021-11-06 19:35 ` [PATCH v2 2/2] drm: Remove CONFIG_DRM_KMS_CMA_HELPER option Thomas Zimmermann
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=a9e2d66e-1a85-b61f-ee3b-ca7032e0516f@tronnes.org \
--to=noralf@tronnes.org \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-sunxi@lists.linux.dev \
--cc=maarten.lankhorst@linux.intel.com \
--cc=marcel@ziswiler.com \
--cc=mripard@kernel.org \
--cc=naresh.kamboju@linaro.org \
--cc=tzimmermann@suse.de \
/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).