Merge "Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14" (1c899a48) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -580,7 +580,7 @@ static void _sde_enc_phys_wb_detect_cwb(struct sde_encoder_phys *phys_enc,
		phys_enc->in_clone_mode = false;

		/* Check if WB has CWB support */
		if (!(wb_cfg->features & SDE_WB_HAS_CWB))
		if (!(wb_cfg->features & BIT(SDE_WB_HAS_CWB)))
		return;

		/* Count the number of connectors on the given crtc */

+1 −1

Original line number	Diff line number	Diff line
		@@ -2527,7 +2527,7 @@ void reg_dmav1_setup_vig_qseed3(struct sde_hw_pipe *ctx,

		end:
		if (sspp->layout.format) {
		if (SDE_FORMAT_IS_DX(sspp->layout.format))
		if (!SDE_FORMAT_IS_DX(sspp->layout.format))
		op_mode \|= BIT(14);
		if (sspp->layout.format->alpha_enable) {
		op_mode \|= BIT(10);

+19 −0

Original line number	Diff line number	Diff line
		@@ -3452,6 +3452,25 @@ static int _sde_plane_validate_scaler_v2(struct sde_plane *psde,
		src_w, src_h);
		return -EINVAL;
		}

		/*
		* SSPP fetch , unpack output and QSEED3 input lines need
		* to match for Y plane
		*/
		if (i == 0 &&
		(sde_plane_get_property(pstate, PLANE_PROP_SRC_CONFIG) &
		BIT(SDE_DRM_DEINTERLACE)) &&
		((pstate->scaler3_cfg.src_height[i] != (src_h/2)) \|\|
		(pstate->pixel_ext.roi_h[i] != (src_h/2)))) {
		SDE_ERROR_PLANE(psde,
		"de-interlace fail roi[%d] %d/%d, src %dx%d, src %dx%d\n",
		i, pstate->pixel_ext.roi_w[i],
		pstate->pixel_ext.roi_h[i],
		pstate->scaler3_cfg.src_width[i],
		pstate->scaler3_cfg.src_height[i],
		src_w, src_h);
		return -EINVAL;
		}
		}

		pstate->scaler_check_state = SDE_PLANE_SCLCHECK_SCALER_V2;

+0 −3

Original line number	Diff line number	Diff line
		@@ -418,9 +418,6 @@ int sde_rotator_clk_ctrl(struct sde_rot_mgr *mgr, int enable)
		if (ret)
		goto error_rot_sub;

		/* reinitialize static vbif setting */
		sde_mdp_init_vbif();

		/* Active+Sleep */
		msm_bus_scale_client_update_context(
		mgr->data_bus.bus_hdl, false,

+3 −0

Original line number	Diff line number	Diff line
		@@ -2795,6 +2795,9 @@ static int sde_hw_rotator_config(struct sde_rot_hw_resource *hw,
		item->input.format, item->output.format,
		entry->perf->config.frame_rate);

		/* initialize static vbif setting */
		sde_mdp_init_vbif();

		if (!ctx->sbuf_mode && mdata->default_ot_rd_limit) {
		struct sde_mdp_set_ot_params ot_params;