Unverified Commit 05c452c1 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm: Remove users of drm_format_num_planes 



drm_format_num_planes() is basically a lookup in the drm_format_info table
plus an access to the num_planes field of the appropriate entry.

Most drivers are using this function while having access to the entry
already, which means that we will perform an unnecessary lookup. Removing
the call to drm_format_num_planes is therefore more efficient.

Some drivers will not have access to that entry in the function, but in
this case the overhead is minimal (we just have to call drm_format_info()
to perform the lookup) and we can even avoid multiple, inefficient lookups
in some places that need multiple fields from the drm_format_info
structure.

Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5ffcec9d14a50ed538e37d565f546802452ee672.1558002671.git-series.maxime.ripard@bootlin.com
parent 45babef0

drivers/gpu/drm/arm/malidp_mw.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ malidp_mw_encoder_atomic_check(struct drm_encoder *encoder, 
		return -EINVAL;

	}



	n_planes = drm_format_num_planes(fb->format->format);

	n_planes = fb->format->num_planes;

	for (i = 0; i < n_planes; i++) {

		struct drm_gem_cma_object *obj = drm_fb_cma_get_gem_obj(fb, i);

		/* memory write buffers are never rotated */

drivers/gpu/drm/armada/armada_fb.c

+2 −1
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ struct armada_framebuffer *armada_framebuffer_create(struct drm_device *dev, 
struct drm_framebuffer *armada_fb_create(struct drm_device *dev,

	struct drm_file *dfile, const struct drm_mode_fb_cmd2 *mode)

{

	const struct drm_format_info *info = drm_get_format_info(dev, mode);

	struct armada_gem_object *obj;

	struct armada_framebuffer *dfb;

	int ret;
@@ -97,7 +98,7 @@ struct drm_framebuffer *armada_fb_create(struct drm_device *dev, 
		mode->pitches[2]);



	/* We can only handle a single plane at the moment */

	if (drm_format_num_planes(mode->pixel_format) > 1 &&

	if (info->num_planes > 1 &&

	    (mode->handles[0] != mode->handles[1] ||

	     mode->handles[0] != mode->handles[2])) {

		ret = -EINVAL;

drivers/gpu/drm/drm_fourcc.c

+0 −16
Original line number Diff line number Diff line
@@ -332,22 +332,6 @@ drm_get_format_info(struct drm_device *dev, 
}

EXPORT_SYMBOL(drm_get_format_info);



/**

 * drm_format_num_planes - get the number of planes for format

 * @format: pixel format (DRM_FORMAT_*)

 *

 * Returns:

 * The number of planes used by the specified pixel format.

 */

int drm_format_num_planes(uint32_t format)

{

	const struct drm_format_info *info;



	info = drm_format_info(format);

	return info ? info->num_planes : 1;

}

EXPORT_SYMBOL(drm_format_num_planes);



/**

 * drm_format_plane_cpp - determine the bytes per pixel value

 * @format: pixel format (DRM_FORMAT_*)

drivers/gpu/drm/mediatek/mtk_drm_fb.c

+4 −2
Original line number Diff line number Diff line
@@ -32,10 +32,11 @@ static struct drm_framebuffer *mtk_drm_framebuffer_init(struct drm_device *dev, 
					const struct drm_mode_fb_cmd2 *mode,

					struct drm_gem_object *obj)

{

	const struct drm_format_info *info = drm_get_format_info(dev, mode);

	struct drm_framebuffer *fb;

	int ret;



	if (drm_format_num_planes(mode->pixel_format) != 1)

	if (info->num_planes != 1)

		return ERR_PTR(-EINVAL);



	fb = kzalloc(sizeof(*fb), GFP_KERNEL);
@@ -88,6 +89,7 @@ struct drm_framebuffer *mtk_drm_mode_fb_create(struct drm_device *dev, 
					       struct drm_file *file,

					       const struct drm_mode_fb_cmd2 *cmd)

{

	const struct drm_format_info *info = drm_get_format_info(dev, cmd);

	struct drm_framebuffer *fb;

	struct drm_gem_object *gem;

	unsigned int width = cmd->width;
@@ -95,7 +97,7 @@ struct drm_framebuffer *mtk_drm_mode_fb_create(struct drm_device *dev, 
	unsigned int size, bpp;

	int ret;



	if (drm_format_num_planes(cmd->pixel_format) != 1)

	if (info->num_planes != 1)

		return ERR_PTR(-EINVAL);



	gem = drm_gem_object_lookup(file, cmd->handles[0]);

drivers/gpu/drm/meson/meson_overlay.c

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ static void meson_overlay_atomic_update(struct drm_plane *plane, 
	}



	/* Update Canvas with buffer address */

	priv->viu.vd1_planes = drm_format_num_planes(fb->format->format);

	priv->viu.vd1_planes = fb->format->num_planes;



	switch (priv->viu.vd1_planes) {

	case 3:

CRA Git | Maintained and supported by SUSTech CRA and CCSE