Commit b35d0927 authored by james qian wang (Arm Technology China)'s avatar james qian wang (Arm Technology China) Committed by Liviu Dudau
Browse files

drm/komeda: Add split support for scaler 



To achieve same caling effect compare with none split, the texel
calculation need to use the same scaling ratio before split, so add
"total_xxx" to pipeline to describe the hsize/vsize before split.
Update pipeline and d71_scaler_update accordingly.

v2: Rebase and addressed Liviu's comments

Signed-off-by: default avatarJames Qian Wang (Arm Technology China) <james.qian.wang@arm.com>
Signed-off-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
parent 9a28105f

drivers/gpu/drm/arm/display/komeda/d71/d71_component.c

+42 −5
Original line number Diff line number Diff line
@@ -642,23 +642,58 @@ static void d71_scaler_update(struct komeda_component *c, 


	malidp_write32(reg, BLK_IN_SIZE, HV_SIZE(st->hsize_in, st->vsize_in));

	malidp_write32(reg, SC_OUT_SIZE, HV_SIZE(st->hsize_out, st->vsize_out));

	malidp_write32(reg, SC_H_CROP, HV_CROP(st->left_crop, st->right_crop));



	/* for right part, HW only sample the valid pixel which means the pixels

	 * in left_crop will be jumpped, and the first sample pixel is:

	 *

	 * dst_a = st->total_hsize_out - st->hsize_out + st->left_crop + 0.5;

	 *

	 * Then the corresponding texel in src is:

	 *

	 * h_delta_phase = st->total_hsize_in / st->total_hsize_out;

	 * src_a = dst_A * h_delta_phase;

	 *

	 * and h_init_phase is src_a deduct the real source start src_S;

	 *

	 * src_S = st->total_hsize_in - st->hsize_in;

	 * h_init_phase = src_a - src_S;

	 *

	 * And HW precision for the initial/delta_phase is 16:16 fixed point,

	 * the following is the simplified formula

	 */

	if (st->right_part) {

		u32 dst_a = st->total_hsize_out - st->hsize_out + st->left_crop;



		if (st->en_img_enhancement)

			dst_a -= 1;



		init_ph = ((st->total_hsize_in * (2 * dst_a + 1) -

			    2 * st->total_hsize_out * (st->total_hsize_in -

			    st->hsize_in)) << 15) / st->total_hsize_out;

	} else {

		init_ph = (st->total_hsize_in << 15) / st->total_hsize_out;

	}



	init_ph = (st->hsize_in << 15) / st->hsize_out;

	malidp_write32(reg, SC_H_INIT_PH, init_ph);



	delta_ph = (st->hsize_in << 16) / st->hsize_out;

	delta_ph = (st->total_hsize_in << 16) / st->total_hsize_out;

	malidp_write32(reg, SC_H_DELTA_PH, delta_ph);



	init_ph = (st->vsize_in << 15) / st->vsize_out;

	init_ph = (st->total_vsize_in << 15) / st->vsize_out;

	malidp_write32(reg, SC_V_INIT_PH, init_ph);



	delta_ph = (st->vsize_in << 16) / st->vsize_out;

	delta_ph = (st->total_vsize_in << 16) / st->vsize_out;

	malidp_write32(reg, SC_V_DELTA_PH, delta_ph);



	ctrl = 0;

	ctrl |= st->en_scaling ? SC_CTRL_SCL : 0;

	ctrl |= st->en_alpha ? SC_CTRL_AP : 0;

	ctrl |= st->en_img_enhancement ? SC_CTRL_IENH : 0;

	/* If we use the hardware splitter we shouldn't set SC_CTRL_LS */

	if (st->en_split &&

	    state->inputs[0].component->id != KOMEDA_COMPONENT_SPLITTER)

		ctrl |= SC_CTRL_LS;



	malidp_write32(reg, BLK_CONTROL, ctrl);

	malidp_write32(reg, BLK_INPUT_ID0, to_d71_input_id(&state->inputs[0]));
@@ -716,10 +751,12 @@ static int d71_scaler_init(struct d71_dev *d71, 
	}



	scaler = to_scaler(c);

	set_range(&scaler->hsize, 4, d71->max_line_size);

	set_range(&scaler->hsize, 4, 2048);

	set_range(&scaler->vsize, 4, 4096);

	scaler->max_downscaling = 6;

	scaler->max_upscaling = 64;

	scaler->scaling_split_overlap = 8;

	scaler->enh_split_overlap = 1;



	malidp_write32(c->reg, BLK_CONTROL, 0);

drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h

+16 −3
Original line number Diff line number Diff line
@@ -247,15 +247,22 @@ struct komeda_scaler { 
	struct malidp_range hsize, vsize;

	u32 max_upscaling;

	u32 max_downscaling;

	u8 scaling_split_overlap; /* split overlap for scaling */

	u8 enh_split_overlap; /* split overlap for image enhancement */

};



struct komeda_scaler_state {

	struct komeda_component_state base;

	u16 hsize_in, vsize_in;

	u16 hsize_out, vsize_out;

	u16 total_hsize_in, total_vsize_in;

	u16 total_hsize_out; /* total_xxxx are size before split */

	u16 left_crop, right_crop;

	u8 en_scaling : 1,

	   en_alpha : 1, /* enable alpha processing */

	   en_img_enhancement : 1;

	   en_img_enhancement : 1,

	   en_split : 1,

	   right_part : 1; /* right part of split image */

};



struct komeda_compiz {
@@ -323,11 +330,16 @@ struct komeda_data_flow_cfg { 
	struct komeda_component_output input;

	u16 in_x, in_y, in_w, in_h;

	u32 out_x, out_y, out_w, out_h;

	u16 total_in_h, total_in_w;

	u16 total_out_w;

	u16 left_crop, right_crop, overlap;

	u32 rot;

	int blending_zorder;

	u8 pixel_blend_mode, layer_alpha;

	u8 en_scaling : 1,

	   en_img_enhancement : 1;

	   en_img_enhancement : 1,

	   en_split : 1,

	   right_part : 1; /* right part of display image if split enabled */

};



struct komeda_pipeline_funcs {
@@ -492,6 +504,7 @@ void komeda_pipeline_disable(struct komeda_pipeline *pipe, 
void komeda_pipeline_update(struct komeda_pipeline *pipe,

			    struct drm_atomic_state *old_state);



void komeda_complete_data_flow_cfg(struct komeda_data_flow_cfg *dflow);

void komeda_complete_data_flow_cfg(struct komeda_data_flow_cfg *dflow,

				   struct drm_framebuffer *fb);



#endif /* _KOMEDA_PIPELINE_H_*/

drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c

+17 −1
Original line number Diff line number Diff line
@@ -507,11 +507,18 @@ komeda_scaler_validate(void *user, 
	st->vsize_in = dflow->in_h;

	st->hsize_out = dflow->out_w;

	st->vsize_out = dflow->out_h;

	st->right_crop = dflow->right_crop;

	st->left_crop = dflow->left_crop;

	st->total_vsize_in = dflow->total_in_h;

	st->total_hsize_in = dflow->total_in_w;

	st->total_hsize_out = dflow->total_out_w;



	/* Enable alpha processing if the next stage needs the pixel alpha */

	st->en_alpha = dflow->pixel_blend_mode != DRM_MODE_BLEND_PIXEL_NONE;

	st->en_scaling = dflow->en_scaling;

	st->en_img_enhancement = dflow->en_img_enhancement;

	st->en_split = dflow->en_split;

	st->right_part = dflow->right_part;



	komeda_component_add_input(&st->base, &dflow->input, 0);

	komeda_component_set_output(&dflow->input, &scaler->base, 0);
@@ -665,11 +672,20 @@ komeda_timing_ctrlr_validate(struct komeda_timing_ctrlr *ctrlr, 
	return 0;

}



void komeda_complete_data_flow_cfg(struct komeda_data_flow_cfg *dflow)

void komeda_complete_data_flow_cfg(struct komeda_data_flow_cfg *dflow,

				   struct drm_framebuffer *fb)

{

	u32 w = dflow->in_w;

	u32 h = dflow->in_h;



	dflow->total_in_w = dflow->in_w;

	dflow->total_in_h = dflow->in_h;

	dflow->total_out_w = dflow->out_w;



	/* if format doesn't have alpha, fix blend mode to PIXEL_NONE */

	if (!fb->format->has_alpha)

		dflow->pixel_blend_mode = DRM_MODE_BLEND_PIXEL_NONE;



	if (drm_rotation_90_or_270(dflow->rot))

		swap(w, h);

drivers/gpu/drm/arm/display/komeda/komeda_plane.c

+4 −7
Original line number Diff line number Diff line
@@ -23,10 +23,7 @@ komeda_plane_init_data_flow(struct drm_plane_state *st, 
	memset(dflow, 0, sizeof(*dflow));



	dflow->blending_zorder = st->normalized_zpos;



	/* if format doesn't have alpha, fix blend mode to PIXEL_NONE */

	dflow->pixel_blend_mode = fb->format->has_alpha ?

			st->pixel_blend_mode : DRM_MODE_BLEND_PIXEL_NONE;

	dflow->pixel_blend_mode = st->pixel_blend_mode;

	dflow->layer_alpha = st->alpha >> 8;



	dflow->out_x = st->crtc_x;
@@ -39,8 +36,6 @@ komeda_plane_init_data_flow(struct drm_plane_state *st, 
	dflow->in_w = st->src_w >> 16;

	dflow->in_h = st->src_h >> 16;



	dflow->en_img_enhancement = kplane_st->img_enhancement;



	dflow->rot = drm_rotation_simplify(st->rotation, caps->supported_rots);

	if (!has_bits(dflow->rot, caps->supported_rots)) {

		DRM_DEBUG_ATOMIC("rotation(0x%x) isn't supported by %s.\n",
@@ -50,7 +45,9 @@ komeda_plane_init_data_flow(struct drm_plane_state *st, 
		return -EINVAL;

	}



	komeda_complete_data_flow_cfg(dflow);

	dflow->en_img_enhancement = kplane_st->img_enhancement;



	komeda_complete_data_flow_cfg(dflow, fb);



	return 0;

}

drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ komeda_wb_init_data_flow(struct komeda_layer *wb_layer, 
	dflow->pixel_blend_mode = DRM_MODE_BLEND_PIXEL_NONE;

	dflow->rot = DRM_MODE_ROTATE_0;



	komeda_complete_data_flow_cfg(dflow);

	komeda_complete_data_flow_cfg(dflow, fb);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE