Merge "drm/msm/sde: separate ppsplit utilities in cmd encoder" into msm-4.9 (ffbba3d3) · Commits · e / devices / android_kernel_fairphone_FP3

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

+13 −8

Original line number	Diff line number	Diff line
		@@ -135,8 +135,7 @@ static void sde_encoder_phys_cmd_pp_rd_ptr_irq(void *arg, int irq_idx)
		phys_enc);
		}

		static bool _sde_encoder_phys_is_ppsplit_slave(
		struct sde_encoder_phys *phys_enc)
		static bool _sde_encoder_phys_is_ppsplit(struct sde_encoder_phys *phys_enc)
		{
		enum sde_rm_topology_name topology;

		@@ -144,8 +143,7 @@ static bool _sde_encoder_phys_is_ppsplit_slave(
		return false;

		topology = sde_connector_get_topology_name(phys_enc->connector);
		if (topology == SDE_RM_TOPOLOGY_PPSPLIT &&
		phys_enc->split_role == ENC_ROLE_SLAVE)
		if (topology == SDE_RM_TOPOLOGY_PPSPLIT)
		return true;

		return false;
		@@ -199,6 +197,16 @@ static int _sde_encoder_phys_cmd_handle_ppdone_timeout(
		return -ETIMEDOUT;
		}

		static bool _sde_encoder_phys_is_ppsplit_slave(
		struct sde_encoder_phys *phys_enc)
		{
		if (!phys_enc)
		return false;

		return _sde_encoder_phys_is_ppsplit(phys_enc) &&
		phys_enc->split_role == ENC_ROLE_SLAVE;
		}

		static int _sde_encoder_phys_cmd_wait_for_idle(
		struct sde_encoder_phys *phys_enc)
		{
		@@ -463,13 +471,10 @@ static void sde_encoder_phys_cmd_pingpong_config(
		static bool sde_encoder_phys_cmd_needs_single_flush(
		struct sde_encoder_phys *phys_enc)
		{
		enum sde_rm_topology_name topology;

		if (!phys_enc)
		return false;

		topology = sde_connector_get_topology_name(phys_enc->connector);
		return topology == SDE_RM_TOPOLOGY_PPSPLIT;
		return _sde_encoder_phys_is_ppsplit(phys_enc);
		}

		static int sde_encoder_phys_cmd_control_vblank_irq(