Merge "drm/msm/sde: fix resource allocation for CWB" (5a7e7810) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/sde/sde_crtc.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -514,6 +514,17 @@ static inline int sde_crtc_get_mixer_height(struct sde_crtc *sde_crtc,
		cstate->ds_cfg[0].lm_height : mode->vdisplay);
		}

		/**
		* sde_crtc_get_num_datapath - get the number of datapath active
		* @crtc: Pointer to drm crtc object
		*/
		static inline int sde_crtc_get_num_datapath(struct drm_crtc *crtc)
		{
		struct sde_crtc *sde_crtc = to_sde_crtc(crtc);

		return sde_crtc ? sde_crtc->num_mixers : 0;
		}

		/**
		* sde_crtc_get_rotator_op_mode - get the rotator op mode from the crtc state
		* @crtc: Pointer to drm crtc object

+16 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include "sde_connector.h"
		#include "sde_hw_dsc.h"
		#include "sde_hw_rot.h"
		#include "sde_crtc.h"

		#define RESERVED_BY_OTHER(h, r) \
		((h)->rsvp && ((h)->rsvp->enc_id != (r)->enc_id))
		@@ -1508,9 +1509,23 @@ static int _sde_rm_populate_requirements(
		* Set the requirement for LM which has CWB support if CWB is
		* found enabled.
		*/
		if (!RM_RQ_CWB(reqs) && sde_encoder_in_clone_mode(enc))
		if (!RM_RQ_CWB(reqs) && sde_encoder_in_clone_mode(enc)) {
		reqs->top_ctrl \|= BIT(SDE_RM_TOPCTL_CWB);

		/*
		* topology selection based on conn mode is not valid for CWB
		* as WB conn populates modes based on max_mixer_width check
		* but primary can be using dual LMs. This topology override for
		* CWB is to check number of datapath active in primary and
		* allocate same number of LM/PP blocks reserved for CWB
		*/
		reqs->topology =
		&rm->topology_tbl[SDE_RM_TOPOLOGY_DUALPIPE_3DMERGE];
		if (sde_crtc_get_num_datapath(crtc_state->crtc) == 1)
		reqs->topology =
		&rm->topology_tbl[SDE_RM_TOPOLOGY_SINGLEPIPE];
		}

		SDE_DEBUG("top_ctrl: 0x%llX num_h_tiles: %d\n", reqs->top_ctrl,
		reqs->hw_res.display_num_of_h_tiles);
		SDE_DEBUG("num_lm: %d num_ctl: %d topology: %d split_display: %d\n",