Unverified Commit f3e9632c authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm: Remove users of drm_format_(horz|vert)_chroma_subsampling 



drm_format_horz_chroma_subsampling and drm_format_vert_chroma_subsampling
are basically a lookup in the drm_format_info table plus an access to the
hsub and vsub fields 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 these functions 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.

This is amplified by the fact that most of the time the callers will have
to retrieve both the vsub and hsub fields, meaning that they would perform
twice the lookup.

Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6b3cceb8161e2c1d40c2681de99202328b0a8abc.1558002671.git-series.maxime.ripard@bootlin.com
parent 05c452c1

drivers/gpu/drm/arm/malidp_planes.c

+2 −4
Original line number Diff line number Diff line
@@ -233,8 +233,7 @@ bool malidp_format_mod_supported(struct drm_device *drm, 
			}

		}



		if ((drm_format_horz_chroma_subsampling(format) != 1) ||

		    (drm_format_vert_chroma_subsampling(format) != 1)) {

		if ((info->hsub != 1) || (info->vsub != 1)) {

			if (!(format == DRM_FORMAT_YUV420_10BIT &&

			      (map->features & MALIDP_DEVICE_AFBC_YUV_420_10_SUPPORT_SPLIT))) {

				DRM_DEBUG_KMS("Formats which are sub-sampled should never be split\n");
@@ -244,8 +243,7 @@ bool malidp_format_mod_supported(struct drm_device *drm, 
	}



	if (modifier & AFBC_CBR) {

		if ((drm_format_horz_chroma_subsampling(format) == 1) ||

		    (drm_format_vert_chroma_subsampling(format) == 1)) {

		if ((info->hsub == 1) || (info->vsub == 1)) {

			DRM_DEBUG_KMS("Formats which are not sub-sampled should not have CBR set\n");

			return false;

		}

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

+2 −7
Original line number Diff line number Diff line
@@ -603,8 +603,6 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p, 
	const struct drm_display_mode *mode;

	struct drm_crtc_state *crtc_state;

	unsigned int tmp;

	int hsub = 1;

	int vsub = 1;

	int ret;

	int i;
@@ -642,13 +640,10 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p, 
	if (state->nplanes > ATMEL_HLCDC_LAYER_MAX_PLANES)

		return -EINVAL;



	hsub = drm_format_horz_chroma_subsampling(fb->format->format);

	vsub = drm_format_vert_chroma_subsampling(fb->format->format);



	for (i = 0; i < state->nplanes; i++) {

		unsigned int offset = 0;

		int xdiv = i ? hsub : 1;

		int ydiv = i ? vsub : 1;

		int xdiv = i ? fb->format->hsub : 1;

		int ydiv = i ? fb->format->vsub : 1;



		state->bpp[i] = fb->format->cpp[i];

		if (!state->bpp[i])

drivers/gpu/drm/drm_fourcc.c

+0 −34
Original line number Diff line number Diff line
@@ -352,40 +352,6 @@ int drm_format_plane_cpp(uint32_t format, int plane) 
}

EXPORT_SYMBOL(drm_format_plane_cpp);



/**

 * drm_format_horz_chroma_subsampling - get the horizontal chroma subsampling factor

 * @format: pixel format (DRM_FORMAT_*)

 *

 * Returns:

 * The horizontal chroma subsampling factor for the

 * specified pixel format.

 */

int drm_format_horz_chroma_subsampling(uint32_t format)

{

	const struct drm_format_info *info;



	info = drm_format_info(format);

	return info ? info->hsub : 1;

}

EXPORT_SYMBOL(drm_format_horz_chroma_subsampling);



/**

 * drm_format_vert_chroma_subsampling - get the vertical chroma subsampling factor

 * @format: pixel format (DRM_FORMAT_*)

 *

 * Returns:

 * The vertical chroma subsampling factor for the

 * specified pixel format.

 */

int drm_format_vert_chroma_subsampling(uint32_t format)

{

	const struct drm_format_info *info;



	info = drm_format_info(format);

	return info ? info->vsub : 1;

}

EXPORT_SYMBOL(drm_format_vert_chroma_subsampling);



/**

 * drm_format_plane_width - width of the plane given the first plane

 * @width: width of the first plane

drivers/gpu/drm/imx/ipuv3-plane.c

+6 −9
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ drm_plane_state_to_ubo(struct drm_plane_state *state) 
	cma_obj = drm_fb_cma_get_gem_obj(fb, 1);

	BUG_ON(!cma_obj);



	x /= drm_format_horz_chroma_subsampling(fb->format->format);

	y /= drm_format_vert_chroma_subsampling(fb->format->format);

	x /= fb->format->hsub;

	y /= fb->format->vsub;



	return cma_obj->paddr + fb->offsets[1] + fb->pitches[1] * y +

	       fb->format->cpp[1] * x - eba;
@@ -134,8 +134,8 @@ drm_plane_state_to_vbo(struct drm_plane_state *state) 
	cma_obj = drm_fb_cma_get_gem_obj(fb, 2);

	BUG_ON(!cma_obj);



	x /= drm_format_horz_chroma_subsampling(fb->format->format);

	y /= drm_format_vert_chroma_subsampling(fb->format->format);

	x /= fb->format->hsub;

	y /= fb->format->vsub;



	return cma_obj->paddr + fb->offsets[2] + fb->pitches[2] * y +

	       fb->format->cpp[2] * x - eba;
@@ -352,7 +352,6 @@ static int ipu_plane_atomic_check(struct drm_plane *plane, 
	struct drm_framebuffer *old_fb = old_state->fb;

	unsigned long eba, ubo, vbo, old_ubo, old_vbo, alpha_eba;

	bool can_position = (plane->type == DRM_PLANE_TYPE_OVERLAY);

	int hsub, vsub;

	int ret;



	/* Ok to disable */
@@ -471,10 +470,8 @@ static int ipu_plane_atomic_check(struct drm_plane *plane, 
		 * The x/y offsets must be even in case of horizontal/vertical

		 * chroma subsampling.

		 */

		hsub = drm_format_horz_chroma_subsampling(fb->format->format);

		vsub = drm_format_vert_chroma_subsampling(fb->format->format);

		if (((state->src.x1 >> 16) & (hsub - 1)) ||

		    ((state->src.y1 >> 16) & (vsub - 1)))

		if (((state->src.x1 >> 16) & (fb->format->hsub - 1)) ||

		    ((state->src.y1 >> 16) & (fb->format->vsub - 1)))

			return -EINVAL;

		break;

	case DRM_FORMAT_RGB565_A8:

drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c

+2 −7
Original line number Diff line number Diff line
@@ -557,14 +557,9 @@ static void _dpu_plane_setup_scaler(struct dpu_plane *pdpu, 
		struct dpu_plane_state *pstate,

		const struct dpu_format *fmt, bool color_fill)

{

	uint32_t chroma_subsmpl_h, chroma_subsmpl_v;

	const struct drm_format_info *info = drm_format_info(fmt->base.pixel_format);



	/* don't chroma subsample if decimating */

	chroma_subsmpl_h =

		drm_format_horz_chroma_subsampling(fmt->base.pixel_format);

	chroma_subsmpl_v =

		drm_format_vert_chroma_subsampling(fmt->base.pixel_format);



	/* update scaler. calculate default config for QSEED3 */

	_dpu_plane_setup_scaler3(pdpu, pstate,

			drm_rect_width(&pdpu->pipe_cfg.src_rect),
@@ -572,7 +567,7 @@ static void _dpu_plane_setup_scaler(struct dpu_plane *pdpu, 
			drm_rect_width(&pdpu->pipe_cfg.dst_rect),

			drm_rect_height(&pdpu->pipe_cfg.dst_rect),

			&pstate->scaler3_cfg, fmt,

			chroma_subsmpl_h, chroma_subsmpl_v);

			info->hsub, info->vsub);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE