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

Commit 20fbb50b authored by Archit Taneja's avatar Archit Taneja Committed by Tomi Valkeinen
Browse files

OMAPDSS: DISPC: Allow both upscaling and downscaling of chroma 



In the function dispc_plane_set_scaling_uv(), create a parameter which tells if
we want to upscale or downscale the chroma plane.

Downscaling of chroma is required by writeback pipeline for converting the input
YUV444 color format to YUV422 or NV12.

Signed-off-by: default avatarArchit Taneja <archit@ti.com>
parent 8ba85306

drivers/video/omap2/dss/dispc.c

+22 −10
Original line number Original line Diff line number Diff line
@@ -1457,6 +1457,7 @@ static void dispc_ovl_set_scaling_uv(enum omap_plane plane, 
{

{

	int scale_x = out_width != orig_width;

	int scale_x = out_width != orig_width;

	int scale_y = out_height != orig_height;

	int scale_y = out_height != orig_height;

	bool chroma_upscale = true;





	if (!dss_has_feature(FEAT_HANDLE_UV_SEPARATE))

	if (!dss_has_feature(FEAT_HANDLE_UV_SEPARATE))

		return;

		return;
@@ -1473,23 +1474,34 @@ static void dispc_ovl_set_scaling_uv(enum omap_plane plane, 




	switch (color_mode) {

	switch (color_mode) {

	case OMAP_DSS_COLOR_NV12:

	case OMAP_DSS_COLOR_NV12:

		/* UV is subsampled by 2 vertically*/

		if (chroma_upscale) {

			/* UV is subsampled by 2 horizontally and vertically */

			orig_height >>= 1;

			orig_height >>= 1;

		/* UV is subsampled by 2 horz.*/

			orig_width >>= 1;

			orig_width >>= 1;

		} else {

			/* UV is downsampled by 2 horizontally and vertically */

			orig_height <<= 1;

			orig_width <<= 1;

		}



		break;

		break;

	case OMAP_DSS_COLOR_YUV2:

	case OMAP_DSS_COLOR_YUV2:

	case OMAP_DSS_COLOR_UYVY:

	case OMAP_DSS_COLOR_UYVY:

		/*For YUV422 with 90/270 rotation,

		/* For YUV422 with 90/270 rotation, we don't upsample chroma */

		 *we don't upsample chroma

		 */

		if (rotation == OMAP_DSS_ROT_0 ||

		if (rotation == OMAP_DSS_ROT_0 ||

			rotation == OMAP_DSS_ROT_180)

				rotation == OMAP_DSS_ROT_180) {

			/* UV is subsampled by 2 hrz*/

			if (chroma_upscale)

				/* UV is subsampled by 2 horizontally */

				orig_width >>= 1;

				orig_width >>= 1;

			else

				/* UV is downsampled by 2 horizontally */

				orig_width <<= 1;

		}



		/* must use FIR for YUV422 if rotated */

		/* must use FIR for YUV422 if rotated */

		if (rotation != OMAP_DSS_ROT_0)

		if (rotation != OMAP_DSS_ROT_0)

			scale_x = scale_y = true;

			scale_x = scale_y = true;



		break;

		break;

	default:

	default:

		BUG();

		BUG();