Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82d20588 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Revert "drm/msm: dpu: Allow planes to extend past active display" 



This reverts commit fb4dd7a9.

This is a preparation change for merging LTS tag v4.19.3 into
msm-kona branch.

DPU will not be used in 4.19 downstream display driver code.
Separate patches are submitted to introduce the downstream
version of the display driver.

Change-Id: I9359e01b9d92ffb14925d46e73af6ba98b4ffa7f
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parent 9f757341

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1535,7 +1535,8 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, 
		cnt++;

		cnt++;





		dst = drm_plane_state_dest(pstate);

		dst = drm_plane_state_dest(pstate);

		if (!drm_rect_intersect(&clip, &dst)) {

		if (!drm_rect_intersect(&clip, &dst) ||

		    !drm_rect_equals(&clip, &dst)) {

			DPU_ERROR("invalid vertical/horizontal destination\n");

			DPU_ERROR("invalid vertical/horizontal destination\n");

			DPU_ERROR("display: " DRM_RECT_FMT " plane: "

			DPU_ERROR("display: " DRM_RECT_FMT " plane: "

				  DRM_RECT_FMT "\n", DRM_RECT_ARG(&crtc_rect),

				  DRM_RECT_FMT "\n", DRM_RECT_ARG(&crtc_rect),

drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c

+13 −21
Original line number Original line Diff line number Diff line
@@ -1254,7 +1254,7 @@ static int dpu_plane_sspp_atomic_update(struct drm_plane *plane, 
	const struct dpu_format *fmt;

	const struct dpu_format *fmt;

	struct drm_crtc *crtc;

	struct drm_crtc *crtc;

	struct drm_framebuffer *fb;

	struct drm_framebuffer *fb;

	int ret, min_scale;

	struct drm_rect src, dst;





	if (!plane) {

	if (!plane) {

		DPU_ERROR("invalid plane\n");

		DPU_ERROR("invalid plane\n");
@@ -1293,29 +1293,21 @@ static int dpu_plane_sspp_atomic_update(struct drm_plane *plane, 
	pdpu->is_rt_pipe = (dpu_crtc_get_client_type(crtc) != NRT_CLIENT);

	pdpu->is_rt_pipe = (dpu_crtc_get_client_type(crtc) != NRT_CLIENT);

	_dpu_plane_set_qos_ctrl(plane, false, DPU_PLANE_QOS_PANIC_CTRL);

	_dpu_plane_set_qos_ctrl(plane, false, DPU_PLANE_QOS_PANIC_CTRL);





	min_scale = FRAC_16_16(1, pdpu->pipe_sblk->maxdwnscale);

	src.x1 = state->src_x >> 16;

	ret = drm_atomic_helper_check_plane_state(state, crtc->state, min_scale,

	src.y1 = state->src_y >> 16;

					  pdpu->pipe_sblk->maxupscale << 16,

	src.x2 = src.x1 + (state->src_w >> 16);

					  true, false);

	src.y2 = src.y1 + (state->src_h >> 16);

	if (ret) {

		DPU_ERROR_PLANE(pdpu, "Check plane state failed (%d)\n", ret);

		return ret;

	}



	DPU_DEBUG_PLANE(pdpu, "FB[%u] " DRM_RECT_FP_FMT "->crtc%u " DRM_RECT_FMT

			", %4.4s ubwc %d\n", fb->base.id, DRM_RECT_FP_ARG(&state->src),

			crtc->base.id, DRM_RECT_ARG(&state->dst),

			(char *)&fmt->base.pixel_format, DPU_FORMAT_IS_UBWC(fmt));





	pdpu->pipe_cfg.src_rect = state->src;

	dst = drm_plane_state_dest(state);





	/* state->src is 16.16, src_rect is not */

	DPU_DEBUG_PLANE(pdpu, "FB[%u] " DRM_RECT_FMT "->crtc%u " DRM_RECT_FMT

	pdpu->pipe_cfg.src_rect.x1 >>= 16;

			", %4.4s ubwc %d\n", fb->base.id, DRM_RECT_ARG(&src),

	pdpu->pipe_cfg.src_rect.x2 >>= 16;

			crtc->base.id, DRM_RECT_ARG(&dst),

	pdpu->pipe_cfg.src_rect.y1 >>= 16;

			(char *)&fmt->base.pixel_format,

	pdpu->pipe_cfg.src_rect.y2 >>= 16;

			DPU_FORMAT_IS_UBWC(fmt));





	pdpu->pipe_cfg.dst_rect = state->dst;

	pdpu->pipe_cfg.src_rect = src;

	pdpu->pipe_cfg.dst_rect = dst;





	_dpu_plane_setup_scaler(pdpu, pstate, fmt, false);

	_dpu_plane_setup_scaler(pdpu, pstate, fmt, false);

drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -259,6 +259,7 @@ static void mdp5_plane_cleanup_fb(struct drm_plane *plane, 
	msm_framebuffer_cleanup(fb, kms->aspace);

	msm_framebuffer_cleanup(fb, kms->aspace);

}

}





#define FRAC_16_16(mult, div)    (((mult) << 16) / (div))

static int mdp5_plane_atomic_check_with_state(struct drm_crtc_state *crtc_state,

static int mdp5_plane_atomic_check_with_state(struct drm_crtc_state *crtc_state,

					      struct drm_plane_state *state)

					      struct drm_plane_state *state)

{

{

drivers/gpu/drm/msm/msm_drv.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -62,8 +62,6 @@ struct msm_gem_vma; 
#define MAX_BRIDGES    8

#define MAX_BRIDGES    8

#define MAX_CONNECTORS 8

#define MAX_CONNECTORS 8





#define FRAC_16_16(mult, div)    (((mult) << 16) / (div))



struct msm_file_private {

struct msm_file_private {

	rwlock_t queuelock;

	rwlock_t queuelock;

	struct list_head submitqueues;

	struct list_head submitqueues;