mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend-drm: Move renderer-only vs. scanout_plane test earlier

Browse Source 
No point trying to put something on the scanout plane in mixed mode.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone
2021-12-07 17:39:19 +00:00
parent ae60745b61
commit 0ecd6c3d33
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/backend-drm/state-propose.c
+2 -6
View File
@@ -431,11 +431,6 @@ drm_output_try_view_on_plane(struct drm_plane *plane,
availability = PLACED_ON_PLANE; availability = PLACED_ON_PLANE;
break; break;
case WDRM_PLANE_TYPE_PRIMARY: case WDRM_PLANE_TYPE_PRIMARY:
if (mode != DRM_OUTPUT_PROPOSE_STATE_PLANES_ONLY) {
availability = NO_PLANES_ACCEPTED;
goto out;
}
ps = drm_output_prepare_scanout_view(state, ev, mode, ps = drm_output_prepare_scanout_view(state, ev, mode,
fb, zpos); fb, zpos);
if (ps) if (ps)
@@ -693,7 +688,8 @@ drm_output_prepare_plane_view(struct drm_output_state *state,
} }
if (plane->type == WDRM_PLANE_TYPE_PRIMARY && if (plane->type == WDRM_PLANE_TYPE_PRIMARY &&
plane != output->scanout_plane) { (plane != output->scanout_plane ||
mode != DRM_OUTPUT_PROPOSE_STATE_PLANES_ONLY)) {
continue; continue;
} }