rockchip: drmhwc: fix cluster two win mode for rk356x

This patch fixes error in vop2_cluster_two_win_mode_check():
  if ((actual_w + xoffset % 16) > 2048) {
      DRM_ERROR("%s act_w(%d) + xoffset(%d) / 16  << 2048 in two win mode\n",

Signed-off-by: hmz007 <hmz007@gmail.com>
Change-Id: Icddb00aa0b403f41803fc1f21083141d844d3dfc
master
hmz007 3 years ago
parent 8be7a7c3c2
commit 1744aa0b6c

@ -983,7 +983,7 @@ int Vop356x::MatchPlane(std::vector<DrmCompositionPlane> *composition_planes,
ctx.state.bClu0Used = true;
ctx.state.iClu0UsedZ = zpos;
ctx.state.iClu0UsedDstXOffset = (*iter_layer)->display_frame.left;
if(input_w > 2048 || output_w > 2048 || eotf != TRADITIONAL_GAMMA_SDR ||
if(input_w > 2032 || output_w > 2032 || eotf != TRADITIONAL_GAMMA_SDR ||
((*iter_layer)->transform & (DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270)) != 0){
ctx.state.bClu0TwoWinMode = false;
}else{
@ -993,7 +993,7 @@ int Vop356x::MatchPlane(std::vector<DrmCompositionPlane> *composition_planes,
ctx.state.bClu1Used = true;
ctx.state.iClu1UsedZ = zpos;
ctx.state.iClu1UsedDstXOffset = (*iter_layer)->display_frame.left;
if(input_w > 2048 || output_w > 2048 || eotf != TRADITIONAL_GAMMA_SDR ||
if(input_w > 2032 || output_w > 2032 || eotf != TRADITIONAL_GAMMA_SDR ||
((*iter_layer)->transform & (DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270)) != 0){
ctx.state.bClu1TwoWinMode = false;
}else{
@ -1267,7 +1267,7 @@ int Vop356x::MatchPlaneMirror(std::vector<DrmCompositionPlane> *composition_plan
ctx.state.bClu0Used = true;
ctx.state.iClu0UsedZ = zpos;
ctx.state.iClu0UsedDstXOffset = (*iter_layer)->display_frame.left;
if(input_w > 2048 || output_w > 2048 ||
if(input_w > 2032 || output_w > 2032 ||
((*iter_layer)->transform & (DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270)) != 0){
ctx.state.bClu0TwoWinMode = false;
}else{
@ -1277,7 +1277,7 @@ int Vop356x::MatchPlaneMirror(std::vector<DrmCompositionPlane> *composition_plan
ctx.state.bClu1Used = true;
ctx.state.iClu1UsedZ = zpos;
ctx.state.iClu1UsedDstXOffset = (*iter_layer)->display_frame.left;
if(input_w > 2048 || output_w > 2048 ||
if(input_w > 2032 || output_w > 2032 ||
((*iter_layer)->transform & (DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270)) != 0){
ctx.state.bClu1TwoWinMode = false;
}else{

Loading…
Cancel
Save