From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: Maxime Ripard <maxime.ripard@bootlin.com>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Sean Paul <seanpaul@chromium.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>,
Hans Verkuil <hans.verkuil@cisco.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org
Subject: Re: [RFC PATCH 04/20] drm/fourcc: Pass the format_info pointer to drm_format_plane_width/height
Date: Wed, 20 Mar 2019 15:26:57 +0100 [thread overview]
Message-ID: <1dcd84b1ece0a0d063bcd5142297b58d43ce0c94.camel@bootlin.com> (raw)
In-Reply-To: <ec00e0a01a09e1711fda190cfcb2ed6a0fbca6eb.1553032382.git-series.maxime.ripard@bootlin.com>
Hi,
Le mardi 19 mars 2019 à 22:57 +0100, Maxime Ripard a écrit :
> So far, the drm_format_plane_height/width functions were operating on the
> format's fourcc and was doing a lookup to retrieve the drm_format_info
> structure and return the cpp.
>
> However, this is inefficient since in most cases, we will have the
> drm_format_info pointer already available so we shouldn't have to perform a
> new lookup. Some drm_fourcc functions also already operate on the
> drm_format_info pointer for that reason, so the API is quite inconsistent
> there.
Same comment as for the previous patch, I think having a
drm_format_info prefix and switching to an inline helper would make
good sense.
Cheers,
Paul
> Let's follow the latter pattern and remove the extra lookup while being a
> bit more consistent.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> ---
> drivers/gpu/drm/drm_fourcc.c | 16 ++++++----------
> drivers/gpu/drm/meson/meson_overlay.c | 6 +++---
> include/drm/drm_fourcc.h | 6 ++++--
> 3 files changed, 13 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> index d8ada4cb689e..57389b9753b2 100644
> --- a/drivers/gpu/drm/drm_fourcc.c
> +++ b/drivers/gpu/drm/drm_fourcc.c
> @@ -325,17 +325,15 @@ EXPORT_SYMBOL(drm_format_plane_cpp);
> /**
> * drm_format_plane_width - width of the plane given the first plane
> * @width: width of the first plane
> - * @format: pixel format
> + * @format: pixel format info
> * @plane: plane index
> *
> * Returns:
> * The width of @plane, given that the width of the first plane is @width.
> */
> -int drm_format_plane_width(int width, uint32_t format, int plane)
> +int drm_format_plane_width(int width, const struct drm_format_info *info,
> + int plane)
> {
> - const struct drm_format_info *info;
> -
> - info = drm_format_info(format);
> if (!info || plane >= info->num_planes)
> return 0;
>
> @@ -349,17 +347,15 @@ EXPORT_SYMBOL(drm_format_plane_width);
> /**
> * drm_format_plane_height - height of the plane given the first plane
> * @height: height of the first plane
> - * @format: pixel format
> + * @format: pixel format info
> * @plane: plane index
> *
> * Returns:
> * The height of @plane, given that the height of the first plane is @height.
> */
> -int drm_format_plane_height(int height, uint32_t format, int plane)
> +int drm_format_plane_height(int height, const struct drm_format_info *info,
> + int plane)
> {
> - const struct drm_format_info *info;
> -
> - info = drm_format_info(format);
> if (!info || plane >= info->num_planes)
> return 0;
>
> diff --git a/drivers/gpu/drm/meson/meson_overlay.c b/drivers/gpu/drm/meson/meson_overlay.c
> index 8ff15d01a8f9..6987c15b6ab9 100644
> --- a/drivers/gpu/drm/meson/meson_overlay.c
> +++ b/drivers/gpu/drm/meson/meson_overlay.c
> @@ -475,7 +475,7 @@ static void meson_overlay_atomic_update(struct drm_plane *plane,
> priv->viu.vd1_stride2 = fb->pitches[2];
> priv->viu.vd1_height2 =
> drm_format_plane_height(fb->height,
> - fb->format->format, 2);
> + fb->format, 2);
> DRM_DEBUG("plane 2 addr 0x%x stride %d height %d\n",
> priv->viu.vd1_addr2,
> priv->viu.vd1_stride2,
> @@ -487,7 +487,7 @@ static void meson_overlay_atomic_update(struct drm_plane *plane,
> priv->viu.vd1_stride1 = fb->pitches[1];
> priv->viu.vd1_height1 =
> drm_format_plane_height(fb->height,
> - fb->format->format, 1);
> + fb->format, 1);
> DRM_DEBUG("plane 1 addr 0x%x stride %d height %d\n",
> priv->viu.vd1_addr1,
> priv->viu.vd1_stride1,
> @@ -499,7 +499,7 @@ static void meson_overlay_atomic_update(struct drm_plane *plane,
> priv->viu.vd1_stride0 = fb->pitches[0];
> priv->viu.vd1_height0 =
> drm_format_plane_height(fb->height,
> - fb->format->format, 0);
> + fb->format, 0);
> DRM_DEBUG("plane 0 addr 0x%x stride %d height %d\n",
> priv->viu.vd1_addr0,
> priv->viu.vd1_stride0,
> diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h
> index 97a58f3e7462..2291f2618211 100644
> --- a/include/drm/drm_fourcc.h
> +++ b/include/drm/drm_fourcc.h
> @@ -269,8 +269,10 @@ uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth);
> uint32_t drm_driver_legacy_fb_format(struct drm_device *dev,
> uint32_t bpp, uint32_t depth);
> int drm_format_plane_cpp(const struct drm_format_info *info, int plane);
> -int drm_format_plane_width(int width, uint32_t format, int plane);
> -int drm_format_plane_height(int height, uint32_t format, int plane);
> +int drm_format_plane_width(int width, const struct drm_format_info *info,
> + int plane);
> +int drm_format_plane_height(int height, const struct drm_format_info *info,
> + int plane);
> unsigned int drm_format_info_block_width(const struct drm_format_info *info,
> int plane);
> unsigned int drm_format_info_block_height(const struct drm_format_info *info,
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2019-03-20 14:27 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-19 21:57 [RFC PATCH 00/20] drm: Split out the formats API and move it to a common place Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 01/20] drm: Remove users of drm_format_num_planes Maxime Ripard
2019-03-20 14:16 ` Paul Kocialkowski
2019-04-02 9:43 ` Emil Velikov
2019-04-02 14:51 ` Maxime Ripard
2019-04-04 16:24 ` Emil Velikov
2019-03-19 21:57 ` [RFC PATCH 02/20] drm: Remove users of drm_format_(horz|vert)_chroma_subsampling Maxime Ripard
2019-03-20 14:19 ` Paul Kocialkowski
2019-03-19 21:57 ` [RFC PATCH 03/20] drm/fourcc: Pass the format_info pointer to drm_format_plane_cpp Maxime Ripard
2019-03-20 14:24 ` Paul Kocialkowski
2019-03-21 10:13 ` Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 04/20] drm/fourcc: Pass the format_info pointer to drm_format_plane_width/height Maxime Ripard
2019-03-20 14:26 ` Paul Kocialkowski [this message]
2019-03-19 21:57 ` [RFC PATCH 05/20] drm: Replace instances of drm_format_info by drm_get_format_info Maxime Ripard
2019-03-20 14:27 ` Paul Kocialkowski
2019-03-19 21:57 ` [RFC PATCH 06/20] lib: Add video format information library Maxime Ripard
2019-03-20 13:39 ` Boris Brezillon
2019-03-21 8:20 ` Maxime Ripard
2019-03-21 8:40 ` Boris Brezillon
2019-03-19 21:57 ` [RFC PATCH 07/20] drm/fb: Move from drm_format_info to image_format_info Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 08/20] drm/malidp: Convert to generic image format library Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 09/20] drm/client: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 10/20] drm/exynos: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 11/20] drm/i915: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 12/20] drm/ipuv3: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 13/20] drm/msm: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 14/20] drm/omap: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 15/20] drm/rockchip: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 16/20] drm/tegra: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 17/20] drm/fourcc: Remove old DRM format API Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 18/20] lib: image-formats: Add v4l2 formats support Maxime Ripard
2019-03-19 23:29 ` Nicolas Dufresne
2019-03-20 14:27 ` Ville Syrjälä
2019-03-20 15:51 ` Nicolas Dufresne
[not found] ` <20190320160939.GR3888@intel.com>
2019-03-20 16:30 ` Nicolas Dufresne
[not found] ` <20190320164133.GT3888@intel.com>
2019-03-20 18:27 ` Nicolas Dufresne
2019-03-20 18:39 ` Ville Syrjälä
2019-03-21 16:04 ` Paul Kocialkowski
2019-03-21 16:35 ` Ville Syrjälä
2019-03-21 19:14 ` Nicolas Dufresne
2019-03-21 21:44 ` Ville Syrjälä
2019-03-22 18:24 ` Nicolas Dufresne
2019-03-22 18:44 ` Ville Syrjälä
2019-03-22 19:25 ` Nicolas Dufresne
2019-03-22 14:42 ` Ville Syrjälä
2019-03-22 18:11 ` Nicolas Dufresne
2019-03-20 18:15 ` Brian Starkey
2019-03-21 15:47 ` Maxime Ripard
2019-03-22 19:55 ` Nicolas Dufresne
2019-04-01 14:44 ` Maxime Ripard
2019-04-11 7:24 ` Hans Verkuil
2019-04-11 7:38 ` Hans Verkuil
2019-04-11 15:55 ` Maxime Ripard
2019-04-11 7:12 ` Hans Verkuil
2019-04-11 7:15 ` Hans Verkuil
2019-03-19 21:57 ` [RFC PATCH 19/20] lib: image-formats: Add more functions Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 20/20] media: sun6i: Convert to the image format API Maxime Ripard
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=1dcd84b1ece0a0d063bcd5142297b58d43ce0c94.camel@bootlin.com \
--to=paul.kocialkowski@bootlin.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hans.verkuil@cisco.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=maxime.ripard@bootlin.com \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=seanpaul@chromium.org \
--cc=thomas.petazzoni@bootlin.com \
/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).