Merge "msm: mdss: Set rotator output format as pseudo planar 420" (6102a066) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_intf_writeback.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -290,9 +290,9 @@ static int mdss_mdp_writeback_prepare_rot(struct mdss_mdp_ctl ctl, void arg)

		if (ctx->bwc_mode \|\| (ctx->rot90 &&
		(mdata->mdp_rev < MDSS_MDP_HW_REV_102)))
		format = mdss_mdp_get_rotator_dst_format(rot->format);
		format = mdss_mdp_get_rotator_dst_format(rot->format, 1);
		else
		format = rot->format;
		format = mdss_mdp_get_rotator_dst_format(rot->format, 0);

		if (ctx->rot90) {
		ctx->opmode \|= BIT(5); /* ROT 90 */

+1 −1

Original line number	Diff line number	Diff line
		@@ -417,7 +417,7 @@ static int mdss_mdp_overlay_pipe_setup(struct msm_fb_data_type *mfd,
		if ((req->flags & MDP_BWC_EN) \|\| ((req->flags & MDP_SOURCE_ROTATED_90)
		&& (mdata->mdp_rev < MDSS_MDP_HW_REV_102)))
		req->src.format =
		mdss_mdp_get_rotator_dst_format(req->src.format);
		mdss_mdp_get_rotator_dst_format(req->src.format, 1);

		fmt = mdss_mdp_get_format_params(req->src.format);
		if (!fmt) {

+10 −2

Original line number	Diff line number	Diff line
		@@ -51,13 +51,21 @@ struct mdss_mdp_rotator_session {
		struct work_struct commit_work;
		};

		static inline u32 mdss_mdp_get_rotator_dst_format(u32 in_format)
		static inline u32 mdss_mdp_get_rotator_dst_format(u32 in_format, u8 in_rot90)
		{
		switch (in_format) {
		case MDP_RGB_565:
		case MDP_BGR_565:
		if (in_rot90)
		return MDP_RGB_888;
		else
		return in_format;
		case MDP_Y_CBCR_H2V2_VENUS:
		case MDP_Y_CBCR_H2V2:
		if (in_rot90)
		return MDP_Y_CRCB_H2V2;
		else
		return in_format;
		case MDP_Y_CB_CR_H2V2:
		case MDP_Y_CR_CB_GH2V2:
		case MDP_Y_CR_CB_H2V2: