Merge "msm: mdss: fix check for hardware cursor mixer stage"

#define IS_RIGHT_MIXER_OV(flags, dst_x, left_lm_w)	\

	((flags & MDSS_MDP_RIGHT_MIXER) || (dst_x >= left_lm_w))

/* hw cursor can only be setup in highest mixer stage */

#define HW_CURSOR_STAGE(mdata) \

	(((mdata)->max_target_zorder + MDSS_MDP_STAGE_0) - 1)

#define BUF_POOL_SIZE 32

static int mdss_mdp_overlay_free_fb_pipe(struct msm_fb_data_type *mfd);

	 * with dedicated cursors within VP

	 */

	if ((req->pipe_type == MDSS_MDP_PIPE_TYPE_CURSOR) &&

		((req->z_order != mdata->max_target_zorder - 1) ||

		((req->z_order != HW_CURSOR_STAGE(mdata)) ||

		 !mdata->ncursor_pipes ||

		 (req->src_rect.w > mdata->max_cursor_size))) {

		pr_err("Inccorect cursor overlay cursor_pipes=%d zorder=%d\n",

		pr_err("Incorrect cursor overlay cursor_pipes=%d zorder=%d\n",

			mdata->ncursor_pipes, req->z_order);

		return -EINVAL;

	}

	memset(&req, 0, sizeof(struct mdp_overlay));

	req.pipe_type = PIPE_TYPE_CURSOR;

	req.z_order = MDSS_MDP_STAGE_6;

	req.z_order = HW_CURSOR_STAGE(mdata);

	req.src.width = img->width;

	req.src.height = img->height;