drm/atomic-helper: Don't allocated plane state in CRTC check
Subsystems (2)
Thomas Zimmermann
maintainerPATCH v3 1/1 drm/atomic-helper: Don't allocated plane state in CRTC check
In drm_atomic_helper_check_crtc_state(), do not add a new plane state to the global state if it does not exist already. Adding a new plane state will result in overhead for the plane during the atomic-commit step.
For the test in drm_atomic_helper_check_crtc_state() to succeed, it is important that the CRTC has an enabled primary plane after the commit. Simply testing the CRTC state's plane_mask for a primary plane is sufficient.
Note that the helper still only tests for an attached primary plane. Drivers have to ensure that the plane contains valid pixel information.
v3:
* test for a primary plane in plane_mask (Ville)
v2:
* remove unnecessary test for plane->crtc (Ville)
* inline drm_atomic_get_next_plane_state() (Ville)
* acquire plane lock before accessing plane->state (Ville)
--- drivers/gpu/drm/drm_atomic_helper.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +1 -9
@@ -945,7 +945,6 @@ int drm_atomic_helper_check_crtc_state(struct drm_crtc_state *crtc_state, bool can_disable_primary_planes) {struct drm_device *dev = crtc_state->crtc->dev; -struct drm_atomic_state *state = crtc_state->state;if (!crtc_state->enable)return 0 ;
@@ -956,14 +955,7 @@ int drm_atomic_helper_check_crtc_state(struct drm_crtc_state *crtc_state,struct drm_plane *plane;drm_for_each_plane_mask (plane, dev, crtc_state->plane_mask) { -struct drm_plane_state *plane_state; - -if (plane->type !=DRM_PLANE_TYPE_PRIMARY ) -continue ; - plane_state =drm_atomic_get_plane_state (state, plane); -if (IS_ERR (plane_state)) -return PTR_ERR (plane_state); -if (plane_state->fb && plane_state->crtc) { +if (plane->type ==DRM_PLANE_TYPE_PRIMARY ) { has_primary_plane = true;break ; }
Signature · 1 line
2.37.3