Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fed71ce authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: sde: add NV21 support for inline rotation"

parents 2a48922d d12a4819

drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c

+17 −1
Original line number Diff line number Diff line
@@ -1337,7 +1337,23 @@ EXPORT_SYMBOL(sde_rotator_inline_release); 
int sde_rotator_inline_get_dst_pixfmt(struct platform_device *pdev,

		u32 src_pixfmt, u32 *dst_pixfmt)

{

	return sde_rot_get_base_tilea5x_pixfmt(src_pixfmt, dst_pixfmt);

	int rc;



	if (!src_pixfmt || !dst_pixfmt)

		return -EINVAL;



	rc = sde_rot_get_base_tilea5x_pixfmt(src_pixfmt, dst_pixfmt);

	if (rc)

		return rc;



	/*

	 * Currently, NV21 tile is not supported as output; hence,

	 * override with NV12 tile.

	 */

	if (*dst_pixfmt == SDE_PIX_FMT_Y_CRCB_H2V2_TILE)

		*dst_pixfmt = SDE_PIX_FMT_Y_CBCR_H2V2_TILE;



	return 0;

}

EXPORT_SYMBOL(sde_rotator_inline_get_dst_pixfmt);

drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c

+1 −0
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ static const u32 sde_hw_rotator_v4_outpixfmts[] = { 
static const u32 sde_hw_rotator_v4_inpixfmts_sbuf[] = {

	SDE_PIX_FMT_Y_CBCR_H2V2_P010,

	SDE_PIX_FMT_Y_CBCR_H2V2,

	SDE_PIX_FMT_Y_CRCB_H2V2,

	SDE_PIX_FMT_Y_CBCR_H2V2_TP10_UBWC,

	SDE_PIX_FMT_Y_CBCR_H2V2_P010_UBWC,

	SDE_PIX_FMT_Y_CBCR_H2V2_UBWC,