Merge "drm/msm/sde: renew rot resource on new crtc state" (96e9809b) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -4772,7 +4772,7 @@ static int sde_crtc_atomic_check(struct drm_crtc *crtc,

		/* identify attached planes that are not in the delta state */
		if (!drm_atomic_get_existing_plane_state(state->state, plane)) {
		rc = sde_plane_confirm_hw_rsvps(plane, pstate);
		rc = sde_plane_confirm_hw_rsvps(plane, pstate, state);
		if (rc) {
		SDE_ERROR("crtc%d confirmation hw failed %d\n",
		crtc->base.id, rc);

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

+14 −14

Original line number	Diff line number	Diff line
		@@ -229,7 +229,7 @@ static struct drm_crtc_state *_sde_plane_get_crtc_state(
		return cstate;
		}

		static bool sde_plane_enabled(struct drm_plane_state *state)
		static bool sde_plane_enabled(const struct drm_plane_state *state)
		{
		return state && state->fb && state->crtc;
		}
		@@ -2960,30 +2960,22 @@ int sde_plane_validate_multirect_v2(struct sde_multirect_plane_states *plane)
		}

		int sde_plane_confirm_hw_rsvps(struct drm_plane *plane,
		const struct drm_plane_state *state)
		const struct drm_plane_state *state,
		struct drm_crtc_state *cstate)
		{
		struct drm_crtc_state *cstate;
		struct sde_plane_state *pstate;
		struct sde_plane_rot_state *rstate;
		struct sde_hw_blk *hw_blk;

		if (!plane \|\| !state) {
		SDE_ERROR("invalid plane/state\n");
		if (!plane \|\| !state \|\| !cstate) {
		SDE_ERROR("invalid parameters\n");
		return -EINVAL;
		}

		pstate = to_sde_plane_state(state);
		rstate = &pstate->rot;

		/* cstate will be null if crtc is disconnected from plane */
		cstate = _sde_plane_get_crtc_state((struct drm_plane_state *)state);
		if (IS_ERR_OR_NULL(cstate)) {
		SDE_ERROR("invalid crtc state\n");
		return -EINVAL;
		}

		if (sde_plane_enabled((struct drm_plane_state *)state) &&
		rstate->out_sbuf) {
		if (sde_plane_enabled(state) && rstate->out_sbuf) {
		SDE_DEBUG("plane%d.%d acquire rotator, fb %d\n",
		plane->base.id, rstate->sequence_id,
		state->fb ? state->fb->base.id : -1);
		@@ -2999,7 +2991,15 @@ int sde_plane_confirm_hw_rsvps(struct drm_plane *plane,
		SDE_EVTLOG_ERROR);
		return -EINVAL;
		}

		_sde_plane_rot_get_fb(plane, pstate, rstate);

		SDE_EVT32(DRMID(plane), rstate->sequence_id,
		state->fb ? state->fb->base.id : -1,
		rstate->out_fb ? rstate->out_fb->base.id : -1,
		hw_blk->id);
		}

		return 0;
		}

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -209,10 +209,12 @@ bool is_sde_plane_virtual(struct drm_plane *plane);
		* sde_plane_confirm_hw_rsvps - reserve an sbuf resource, if needed
		* @plane: Pointer to DRM plane object
		* @state: Pointer to plane state
		* @cstate: Pointer to crtc state containing the resource pool
		* Returns: Zero on success
		*/
		int sde_plane_confirm_hw_rsvps(struct drm_plane *plane,
		const struct drm_plane_state *state);
		const struct drm_plane_state *state,
		struct drm_crtc_state *cstate);

		/**
		* sde_plane_ctl_flush - set/clear control flush mask