diff options
| author | james qian wang (Arm Technology China) <james.qian.wang@arm.com> | 2019-06-10 13:16:02 +0300 |
|---|---|---|
| committer | Liviu Dudau <Liviu.Dudau@arm.com> | 2019-06-19 13:42:17 +0300 |
| commit | b35d0927d3b02ccef061113268c202b7b9fac695 (patch) | |
| tree | 41999bf56fa3d6f56d27508d8ebd611f688eff2d /drivers/gpu/drm/arm/display/komeda/komeda_plane.c | |
| parent | 9a28105f5a439d3dc5e595042b3f97b1bb4cd4f1 (diff) | |
| download | linux-b35d0927d3b02ccef061113268c202b7b9fac695.tar.xz | |
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: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com>
Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
Diffstat (limited to 'drivers/gpu/drm/arm/display/komeda/komeda_plane.c')
| -rw-r--r-- | drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_plane.c b/drivers/gpu/drm/arm/display/komeda/komeda_plane.c index c0e381cee524..9d29820345b9 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_plane.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_plane.c @@ -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; } |