Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2660801f authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/atomic: Only update crtc->x/y if it's part of the state, v2. 



Universal planes may not be assigned to the current crtc, so only
update crtc->x/y when the primary is part of the state and bound
to the current crtc.

Changes since v1:
- Add the crtc check.

Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6066677c

drivers/gpu/drm/drm_atomic_helper.c

+8 −2
Original line number Diff line number Diff line
@@ -665,10 +665,16 @@ drm_atomic_helper_update_legacy_modeset_state(struct drm_device *dev, 


	/* set legacy state in the crtc structure */

	for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) {

		struct drm_plane *primary = crtc->primary;



		crtc->mode = crtc->state->mode;

		crtc->enabled = crtc->state->enable;

		crtc->x = crtc->primary->state->src_x >> 16;

		crtc->y = crtc->primary->state->src_y >> 16;



		if (drm_atomic_get_existing_plane_state(old_state, primary) &&

		    primary->state->crtc == crtc) {

			crtc->x = primary->state->src_x >> 16;

			crtc->y = primary->state->src_y >> 16;

		}



		if (crtc->state->enable)

			drm_calc_timestamping_constants(crtc,