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

Commit 8d9f2f3c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: enable client driven prefetch for sspp rec1"

parents d8e2d66c 1b6b457f

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

+12 −2
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
#define SSPP_TRAFFIC_SHAPER                0x130

#define SSPP_CDP_CNTL                      0x134

#define SSPP_UBWC_ERROR_STATUS             0x138

#define SSPP_CDP_CNTL_REC1                 0x13c

#define SSPP_TRAFFIC_SHAPER_PREFILL        0x150

#define SSPP_TRAFFIC_SHAPER_REC1_PREFILL   0x154

#define SSPP_TRAFFIC_SHAPER_REC1           0x158
@@ -873,10 +874,12 @@ static void sde_hw_sspp_setup_ts_prefill(struct sde_hw_pipe *ctx, 
}



static void sde_hw_sspp_setup_cdp(struct sde_hw_pipe *ctx,

		struct sde_hw_pipe_cdp_cfg *cfg)

		struct sde_hw_pipe_cdp_cfg *cfg,

		enum sde_sspp_multirect_index index)

{

	u32 idx;

	u32 cdp_cntl = 0;

	u32 cdp_cntl_offset = 0;



	if (!ctx || !cfg)

		return;
@@ -884,6 +887,13 @@ static void sde_hw_sspp_setup_cdp(struct sde_hw_pipe *ctx, 
	if (_sspp_subblk_offset(ctx, SDE_SSPP_SRC, &idx))

		return;



	if (index == SDE_SSPP_RECT_0)

		cdp_cntl_offset = SSPP_CDP_CNTL;

	else if (index == SDE_SSPP_RECT_1)

		cdp_cntl_offset = SSPP_CDP_CNTL_REC1;

	else

		return;



	if (cfg->enable)

		cdp_cntl |= BIT(0);

	if (cfg->ubwc_meta_enable)
@@ -893,7 +903,7 @@ static void sde_hw_sspp_setup_cdp(struct sde_hw_pipe *ctx, 
	if (cfg->preload_ahead == SDE_SSPP_CDP_PRELOAD_AHEAD_64)

		cdp_cntl |= BIT(3);



	SDE_REG_WRITE(&ctx->hw, SSPP_CDP_CNTL, cdp_cntl);

	SDE_REG_WRITE(&ctx->hw, cdp_cntl_offset, cdp_cntl);

}



static void _setup_layer_ops(struct sde_hw_pipe *c,

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

+3 −1
Original line number Diff line number Diff line
@@ -502,9 +502,11 @@ struct sde_hw_sspp_ops { 
	 * setup_cdp - setup client driven prefetch

	 * @ctx: Pointer to pipe context

	 * @cfg: Pointer to cdp configuration

	 * @index: rectangle index in multirect

	 */

	void (*setup_cdp)(struct sde_hw_pipe *ctx,

			struct sde_hw_pipe_cdp_cfg *cfg);

			struct sde_hw_pipe_cdp_cfg *cfg,

			enum sde_sspp_multirect_index index);



	/**

	 * setup_secure_address - setup secureity status of the source address

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

+2 −1
Original line number Diff line number Diff line
@@ -3603,7 +3603,8 @@ static int sde_plane_sspp_atomic_update(struct drm_plane *plane, 
					SDE_FORMAT_IS_TILE(fmt);

			cdp_cfg->preload_ahead = SDE_WB_CDP_PRELOAD_AHEAD_64;



			psde->pipe_hw->ops.setup_cdp(psde->pipe_hw, cdp_cfg);

			psde->pipe_hw->ops.setup_cdp(psde->pipe_hw, cdp_cfg,

					pstate->multirect_index);

		}



		if (psde->pipe_hw->ops.setup_sys_cache) {