|
|
@ -726,18 +726,18 @@ drm_output_prepare_plane_view(struct drm_output_state *state, |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
if (drm_output_check_plane_has_view_assigned(plane, state)) { |
|
|
|
if (drm_output_check_plane_has_view_assigned(plane, state)) { |
|
|
|
drm_debug(b, "\t\t\t\t[plane] not adding plane %d to" |
|
|
|
drm_debug(b, "\t\t\t\t[plane] not trying plane %d: " |
|
|
|
" candidate list: view already assigned " |
|
|
|
"another view already assigned", |
|
|
|
"to a plane\n", plane->plane_id); |
|
|
|
plane->plane_id); |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (plane->zpos_min >= current_lowest_zpos) { |
|
|
|
if (plane->zpos_min >= current_lowest_zpos) { |
|
|
|
drm_debug(b, "\t\t\t\t[plane] not adding plane %d to " |
|
|
|
drm_debug(b, "\t\t\t\t[plane] not trying plane %d: " |
|
|
|
"candidate list: minimum zpos (%"PRIu64") " |
|
|
|
"plane's minimum zpos (%"PRIu64") above " |
|
|
|
"plane's above current lowest zpos " |
|
|
|
"current lowest zpos (%"PRIu64")\n", |
|
|
|
"(%"PRIu64")\n", plane->plane_id, |
|
|
|
plane->plane_id, plane->zpos_min, |
|
|
|
plane->zpos_min, current_lowest_zpos); |
|
|
|
current_lowest_zpos); |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -758,9 +758,8 @@ drm_output_prepare_plane_view(struct drm_output_state *state, |
|
|
|
(!fb || !(fb->plane_mask & (1 << plane->plane_idx)))) { |
|
|
|
(!fb || !(fb->plane_mask & (1 << plane->plane_idx)))) { |
|
|
|
*try_view_on_plane_failure_reasons |= |
|
|
|
*try_view_on_plane_failure_reasons |= |
|
|
|
FAILURE_REASONS_FB_FORMAT_INCOMPATIBLE; |
|
|
|
FAILURE_REASONS_FB_FORMAT_INCOMPATIBLE; |
|
|
|
drm_debug(b, "\t\t\t\t[plane] not adding plane %d to " |
|
|
|
drm_debug(b, "\t\t\t\t[plane] not trying plane %d: " |
|
|
|
"candidate list: invalid pixel format\n", |
|
|
|
"invalid pixel format\n", plane->plane_id); |
|
|
|
plane->plane_id); |
|
|
|
|
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|